Configuration
Merge branch 'master' of https://github.com/hzakaria/OurProjects.git

Conflicts:
	e-examen-master/e-examen-modele/src/main/java/com/examen/model/examens/Classe.java
	e-examen-master/e-examen-service/src/main/java/com/examen/service/examens/ClasseService.java
	e-examen-master/e-examen-service/src/main/java/com/examen/service/examens/ClasseServiceImp.java