partial commit
Merge branch 'master' of https://github.com/claroline/CoreBundle into competence-referencial

Conflicts:
	Entity/Workspace/AbstractWorkspace.php
	Resources/config/routing.yml
	Resources/views/Administration/layout.html.twig
wip
partial commit beta version
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into competence-referencial
partial commit
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into competence-referencial

Conflicts:
	Form/ProfileType.php
	Library/Installation/AdditionalInstaller.php
partial commit
Merge branch 'master' of https://github.com/claroline/CoreBundle into competence-referencial
competence are linkable v1.1
deleleted competence_hierarchy form too complicated
partial commit
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into competence-nestedtree

Conflicts:
	Library/Installation/AdditionalInstaller.php
	Library/Installation/Updater/Updater030000.php
	Resources/translations/platform.en.yml
	Resources/translations/platform.fr.yml
stable version
partial commit
stable version, association tool+fixed bug
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into competence-nestedtree

Conflicts:
	Entity/Workspace/Workspace.php
	Library/Installation/Updater/Updater030000.php
	Resources/translations/platform.en.yml
	Resources/translations/platform.fr.yml
partial commit
Merge branch 'master' of https://github.com/claroline/CoreBundle into competence-nestedtree

Conflicts:
	Resources/translations/platform.en.yml
	Resources/translations/platform.fr.yml
fix conflict