added to admin section: which users are under the age of 13 #1283
Show the user if a contact is sharing with them when viewing their profile page.
Show avatar of recent user in conversation list
Fix hashtags that start a line when posting to Facebook or Twitter, by applying all the same options to strip_markdown as applying to markdownify, fixes #3768 and #4154
Add PeopleHelper#sharing_message method and english localized message text.
Use PeopleHelper#sharing_message view helper method in the profile sidebar.
Add SASS for sharing message.
Merge pull request #4240 from jaywink/3768-hashmark-first-character

Fix hashtags that start a line when posting to Facebook or Twitter
Merge pull request #4244 from svbergerem/4237-consistent-conversation-list

Show avatar of recent user in conversation list

Conflicts:
	Changelog.md
fixed #cat-footer overlay
Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin
make age search postgres compatible, add spec, changelog
Return 404 for nonexistent photo on mobiles
Added test to avoid regression
Updated the Galician (gl) translation
Merge pull request #4260 from Gallaecio/gl

Updated the Galician (gl) translation
bump recommended Ruby version to 1.9.3-p448

See http://www.ruby-lang.org/en/news/2013/06/27/hostname-check-bypassing-vulnerability-in-openssl-client-cve-2013-4073/
Drop weird stop in conversations controller spec
... and make the specs actually pass
Improve participants link style in conversation, close #4236

Move it to the right and replace the text by an image with the nice tooltip, modify the test.