icones amandine
Merge branch 'master' of https://github.com/marcu/acadewy

Conflicts:
	app/controllers/CommunitiesController.php