mobile private post dont show error 404
fix missing indent for correct header container relative positions
Update Changelog.md
try to fix Jasmine failure on CI by not overwriting app.views.Location in spec
bump recommended ruby version to 1.9.3-p429
bump sidekiq
downgrade multi_json
Revert "downgrade multi_json"

This reverts commit 4c4a98f42e455c53018251584ec8dbf6b15792b1.
Do not pass AR objects to Sidekiq

In the new version Sidekiq calls JSON.generate on the passed arguments, which blows up with AR objects
Revert "bump sidekiq"

This reverts commit 9307a1aaeb2825bd025b46c25fc4c3d61b6d7954.
Revert "Do not pass AR objects to Sidekiq"

This reverts commit 32935be9b1f85e0e879883897fb3c7b7dffea7ca.
fix mentions at the end of a post
Merge pull request #4150 from svbergerem/3746-fix-mentions

fix mentions at the end of a post
Merge branch 'patch-2' of git://github.com/rivendale2010/diaspora into develop

Conflicts:
	Changelog.md
	app/views/layouts/_header.html.haml
Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile

Conflicts:
	Changelog.md
404, not 500, if  signed out user wants to see a non public/existing post

Also add some specs for Post#find_by_guid_or_id_with_user
Add the gem updates section for the current release to the changelog
updated 186 locale files [ci skip]
Merge pull request #1 from diaspora/develop

Develop