RBAC
Merge remote-tracking branch 'origin/saabDavid'

Conflicts:
	protected/config/main.php
Merge remote-tracking branch 'origin/master' into saabCarlos