Design the main page
Design the main page
Merge branch 'master' of https://github.com/Alexgalinier/Roparz

Conflicts:
	app/templates/admin/accueil.php