removendo arquivos desnecessários
Merge branch 'ivan'
Removendo arquivos desnecessários
Merge branch 'ivan'
Merge branch 'ivan'

Conflicts:
	assets/SQLiteDatabaseBrowserPortable/Data/settings/SQLiteDatabaseBrowserPortableSettings.ini
	assets/SQLiteDatabaseBrowserPortable/Data/settings/arcadatbasebrowser.reg
Merge branch 'ivan'
Alterações no Login e Cadastro de Usuários
commit =)
Merge branch 'ivan'

Conflicts:
	assets/SQLiteDatabaseBrowserPortable/Data/settings/SQLiteDatabaseBrowserPortableSettings.ini
	assets/SQLiteDatabaseBrowserPortable/Data/settings/arcadatbasebrowser.reg
add to index
add to index
Merge branch 'master' of
https://github.com/monografia-utfpr/VistoriApp.git

Conflicts:
	res/values/colors.xml
Ok
removendo database
Atualizando com as alterações em master