modificatin primary de bootstrap + info, actu et community
Merge branch 'master' of https://github.com/motoi75/em_project

Conflicts:
	application/views/pages/accueil.php
favicon
probleme conflit (resolu)
Merge branch 'master' of https://github.com/motoi75/em_project
load model en fonction de l'URL