propriedades
Merge branch 'master' of
https://github.com/vocefiscal/vocefiscal-android.git

Conflicts:
	Code/.classpath
	Code/project.properties