Inicio actividades pre-confirmadas
Merge origin/master

Conflicts:
	src/main/java/com/unsoft/acl_grenoble/controller/ControleurAssociation.java