Merge remote-tracking branch 'upstream/master'

Conflicts:
	Manager/RightsManager.php
Merge https://github.com/solispauwels/CoreBundle into default-resource-perms

Conflicts:
	Manager/RightsManager.php