Merge branch 'master' of https://github.com/haflinger/comulien

Conflicts:
	application/data/log/application.log
	application/views/scripts/evenement/accueil.phtml
Merge branch 'master' of https://github.com/haflinger/comulien

Conflicts:
	application/data/log/application.log