added to admin section: which users are under the age of 13 #1283
Merge pull request #4179 from diaspora/update_gems

Update gems
unify ignore and hide #bugmash #monday
update reference to postgres? in the migrations too
Merge pull request #4213 from svbergerem/3828-unify-hide-ignore

unify ignore and hide #bugmash #monday
add gem updates to changelog [ci skip]
Remove alpha branding
Merge pull request #4216 from svbergerem/4196-remove-alpha-branding

Remove alpha branding
Updated Wiki sources in README
Do not load environment when precompiling assets
move asset_sync require to the earliest point possible
fix changelog [ci skip]
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.