avancée fct
Merge https://github.com/siriusxiv/AER
edit marche
petits ajouts
Merge https://github.com/siriusxiv/AER
debut refuse inscription
Merge branch 'master' of https://github.com/royerjohan/AER

Conflicts:
	app/controllers/admin/DemandesInscription.java