dan
Merge branch 'master' of https://github.com/xiitec/graph

Conflicts:
	Controller/UsersController.php
Merge branch 'master' of https://github.com/xiitec/graph