- correção de conflito
Merge branch 'master' of https://github.com/tomwel/CleanUpMobile.git

Conflicts:
	res/values/strings.xml