more changes
Merge branch 'master' of https://github.com/joaogithub/Testes

Conflicts:
	res/values-v14/styles.xml