add settings web mobile
Merge branch 'hotfix/0.0.2.3'
don't join the tags table here, it makes the query slower
update changelog
bump configurate
Merge pull request #3932 from marpo60/improve-tags-query

don't join the tags table here, it makes the query slower
Refactor contacts/index
fix translation in contacts_helper
change #count to #size in notifications_helper to reduce queries
update changelog
Merge pull request #3937 from marpo60/refactor-contacts-view

Refactor contacts view
Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile

Conflicts:
	Changelog.md
Merge branch 'movilla-settings_mobile' into develop
Stream form on profile page
Merge pull request #3918 from asphxia/3910-stream-form-on-profile-page

Stream form on profile page
ensure our locales are at the bottom of the load path, fixes #2614
Hovering a Timeago-String should show the Timestamp
Merge pull request #3914 from asphxia/3149-timeago-show-timestamp

Hovering a Timeago-String should show the Timestamp
Reshare alert box is appearing twice
do not display the publisher on the profile photos page