code review & cleanup
updated tests
code review & cleanup
Merge branch 'feature/editing-roles' into develop
Merge branch 'develop' of git://github.com/massiveart/SuluSecurityBundle into feature/authentication

Conflicts:
	Controller/UsersController.php
	Entity/User.php
	Resources/config/doctrine/User.orm.xml
	Resources/config/routing.yml