Teste
Merge branch 'master' of https://github.com/tiagoduarte21/DoarMais.git

Conflicts:
	appcompat_v7/bin/appcompat_v7.jar