Primeiro commit
Test commit
Merge branch 'master' of https://github.com/jcarlocg/Project-UFSCPS

Conflicts:
	bin/UFSCPS.apk
	bin/classes.dex
	bin/resources.ap_