modificado xml do edit perfil
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_annotations_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	local.properties
Merge remote-tracking branch 'origin/master'
modificado xml do edit perfil