add settings web mobile
Merge branch 'settings_mobile' of git://github.com/movilla/diaspora into movilla-settings_mobile

Conflicts:
	Changelog.md
Merge branch 'movilla-settings_mobile' into develop