Bug do tablet corrigido
Telas adicionar disciplinas e alunos
adcionado os arquivos
Merge branch 'master' of https://github.com/diegoifnmg/DiarioDeClasseAndroid

Conflicts:
	DiarioDeClasse/bin/classes/br/edu/tads/DataAcess/AlunoDAO.class
	DiarioDeClasse/bin/classes/br/edu/tads/DataAcess/BDUtil.class
	DiarioDeClasse/bin/classes/br/edu/tads/DataAcess/DisciplinaDAO.class
	DiarioDeClasse/bin/classes/br/edu/tads/diariodeclasse/CadastroDisciplina.class
	DiarioDeClasse/bin/classes/br/edu/tads/diariodeclasse/MainActivity.class