commit local
Merge branch 'master' of
https://github.com/monografia-utfpr/VistoriApp.git

Conflicts:
	project.properties
adicionando tela de login