Criação da tela ListagemDisciplina.java
Merge branch 'master' of https://github.com/diegoifnmg/DiarioDeClasseAndroid

Conflicts:
	DiarioDeClasse/AndroidManifest.xml
	DiarioDeClasse/bin/classes/br/edu/tads/DataAcess/DisciplinaDAO.class
	DiarioDeClasse/gen/br/edu/tads/diariodeclasse/R.java
	DiarioDeClasse/res/values/strings.xml