added to admin section: which users are under the age of 13 #1283
Merge branch 'hotfix/v0.1.0.1'
Add loading indicator on tag pages, remove the second one from the profile page
Fix login for short passwords
never pass nil to image_tag

In production that results in a not precompiled error
Update robots.txt comments

clarify comments and update permanently moved URL
Merge pull request #4222 from rivendale2010/patch-1

Update robots.txt comments
Merge pull request #4221 from svbergerem/4123-fix-login-short-password

Fix login for short passwords
Merge pull request #4217 from svbergerem/4041-loading-indicator

Add loading indicator on tag pages, remove second one from profile page

Conflicts:
	Changelog.md
Check for nil before splitting contact_ids param.
#4180 was placed in the wrong milestone
Merge pull request #4230 from Flaburgan/patch-1

#4180 was placed in the wrong milestone
Merge pull request #4229 from davexunit/4227-private-message-error

Check for nil before splitting contact_ids param in ConversationsController
tweak readme [ci skip]

* Drop remaining links to the Github wiki
* Redirect Mailing list links through the wiki
* Update links that are redirects
* enable syntaxhighlighting
update all wiki links
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.