178 - Você Fiscal - Tela Fiscalização Concluida
Merge branch 'master' of
https://github.com/vocefiscal/vocefiscal-android.git

Conflicts:
	Code/project.properties
Merge branch 'master' of https://github.com/vocefiscal/vocefiscal-android.git