Ajustes
Merge branch 'master' of https://github.com/gdonscoi/TCC.git

Conflicts:
	SchoolNet_TCC/src/br/com/uniararas/actvity/MenuActivity.java
	SchoolNet_TCC/src/br/com/uniararas/beans/AnoSemestre.java
	SchoolNet_TCC/src/br/com/uniararas/services/ConsultaAnoSemestreService.java