Projeto atualizado
Merge branch 'master' of https://github.com/Hackathon-Sesc-Santo-Andre/Grupo4

Conflicts:
	android-app/zxing-android/bin/zxing-android.jar