Final changes to the .xml
Merge branch 'manterUsuario' of https://github.com/PVMP-ORG-DEVEL/PVMP into manterUsuario

Conflicts:
	res/layout/account_settings_activity.xml
	res/values/strings.xml