partial commit
Merge branch 'workspaces-management' of https://github.com/easy-es/CoreBundle into workspaces-management

Conflicts:
	Entity/Workspace/AbstractWorkspace.php