Merge branch 'hotfix/0.0.3.4'
added to admin section: which users are under the age of 13 #1283
mobile private post dont show error 404
MixCloud oEmbed support

Adding support for MixCloud oEmbed
Added MixCloud oEmbed to oembed_providers_list
fix missing indent for correct header container relative positions
Update Changelog.md
Merge branch 'develop' of https://github.com/diaspora/diaspora into develop
oembed_providers.yml added for custom (outside of ruby-oembed) oEmbed providers.
Merge pull request #4131 from Ruxton/patch-1

Refactoring oEmbed Providers & Adding MixCloud oEmbed support
Fix preview with locator feature
Merge pull request #4147 from svbergerem/post-preview-locator

Fix preview with locator feature
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.