Merge branch 'hotfix/0.0.2.2'
add settings web mobile
Update Devise to 2.1.3

http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
Merge branch 'hotfix/0.0.2.3'
Merge branch 'hotfix/0.0.2.3' into develop

Conflicts:
	Changelog.md
	Gemfile.lock
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