modif
Merge branch 'master' of https://github.com/Thibowdwi/digisquare
Merge branch 'master' of https://github.com/Thibowdwi/digisquare

Conflicts:
	app/Controller/EventsController.php