Using annotations for routing (1 part).
Fixing the user entity broken test.
Merge branch 'master' of https://github.com/claroline/Claroline
Using annotation for routing (part2)
Using annotation for routing (part3).
Submodules update.
Merge branch 'master' of https://github.com/claroline/Claroline

Conflicts:
	src/core/Claroline/CoreBundle/Entity/User.php
	src/core/Claroline/CoreBundle/Tests/Entity/UserTest.php