Diagrama JPA
Merge branch 'master' of https://github.com/DeEvo/deevo.git

Conflicts:
	src/META-INF/persistence.xml
	src/com/deevo/java/server/model/entity/Alerta.java
	src/com/deevo/java/server/model/entity/Alumno.java
	src/com/deevo/java/server/model/entity/Aula.java
	src/com/deevo/java/server/model/entity/Colegio.java
	src/com/deevo/java/server/model/entity/ColegioProfesor.java
	src/com/deevo/java/server/model/entity/CursoHabilitado.java
	src/com/deevo/java/server/model/entity/GradoSeccion.java
	src/com/deevo/java/server/model/entity/PeriodoAcademico.java
	src/com/deevo/java/server/model/entity/Test.java
	src/com/deevo/java/server/model/entity/TestPrivilegio.java