gjhklm
Merge branch 'master' of https://github.com/gudaENSIMAG/TP_Gestion.git

Conflicts:
	app/controllers/Annotations.java
Merge branch 'master' of https://github.com/gudaENSIMAG/TP_Gestion.git

Conflicts:
	app/controllers/Annotations.java