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

Conflicts:
	conf/initial-data.yml
Merge branch 'master' of https://github.com/gudaENSIMAG/TP_Gestion.git

Conflicts:
	app/views/Application/index.html
	app/views/main.html