Conflicts:
	public/javascripts/app/models/stream.js

Revert "Revert "refactoring backbone urls""

This reverts commit 838da1fd.

Revert "revert 9b1d64bb as it is causing inf. scroll to break (stream model now has a post collection)"

This reverts commit 2a69c0eb.

This reverts commit 4ad58bdf.

revert 9b1d64bb as it is causing inf. scroll to break (stream model now has a post collection)

Update config/application.yml.example [ci skip]

move loading rack ssl to an initializer, so we have EnviromentConfiguration and AppConfig.  also, circumvent ssl requirement option is now back"

blarg.  ActionDispatch::Static isnt always there. took out the option so people can run their ssl pods correctly for now

Revert "add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info"

This reverts commit ed457894.

This reverts commit 23fb1b0a.

add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info

fix for the migration for some linux users, which the AR stubs were not carring over from the migration file to the ShareVisibilityConverter