Fixing profile.
Merge branch 'master' of https://github.com/claroline/CoreBundle into fixing-profile

Conflicts:
	Resources/views/Profile/profile.html.twig
Merge pull request #104 from ngodfraind/fixing-profile

Fixing profile.