fixed tests
Merge branch 'develop' of git://github.com/sulu-cmf/SuluSecurityBundle into feature/content-navigation-refactoring

Conflicts:
	Tests/Functional/Controller/UserControllerTest.php