roles
Merge origin/master

Conflicts:
	controllers/HilleDemoController.php
Merge origin/master

Conflicts:
	controllers/HilleDemoController.php