Commit
Commit 2
Merge branch 'master' of https://github.com/diegoifnmg/DiarioDeClasseAndroid

Conflicts:
	DiarioDeClasse/bin/DiarioDeClasse.apk
	DiarioDeClasse/bin/classes.dex
	DiarioDeClasse/bin/classes/br/edu/tads/DataAcess/BDUtil.class
	DiarioDeClasse/bin/classes/br/edu/tads/DataAcess/DisciplinaDAO.class
	DiarioDeClasse/bin/resources.ap_