events
Merge branch 'master' of https://github.com/simultech/Empowered

Conflicts:
	app/Controller/InformationController.php