Initial commit
Merge branch 'develop'

Conflicts:
	app/controllers/RolesController.php
	app/controllers/UserController.php
	app/controllers/UsersController.php