Role based access control and authentication
Merge branch 'master' of https://github.com/mnzuki/data

Conflicts:
	dispenserapp/protected/controllers/UsersController.php
	dispenserapp/protected/runtime/application.log