Use dev-master for the doctrine bundle
Creation of the doctrine entity resolver to be able to use doctrine entity listener easily on every entities
Refacto code with no use of the setLocale method for badge as the entity listener is here for that + correct test
Don't use dev-master branch of DoctrineBundle but still use entity listener features
Add license on new files
Merge pull request #408 from maxailloud/doctrine_entity_listener_resolver

Doctrine entity listener resolver for the win
ergo
Translations.
Merge pull request #410 from ngodfraind/ergo

ergo
Merge pull request #411 from easy-es/ergonomy

Ergonomy
Renaming "lines_per_page".
Merge pull request #412 from ngodfraind/ergo

Renaming "lines_per_page".
Merge pull request #413 from easy-es/ergonomy

datepicker fill the form in the agenda
Merge branch 'master' of https://github.com/claroline/CoreBundle into ergonomy

Conflicts:
	Resources/views/Tool/workspace/roles/workspaceGroups.html.twig