add a confirmation before deleteting a resource
added translations
fixed translations
Merge pull request #51 from easy-es/resource-manager-delete

add a confirmation before deleteting a resource
Removed useless placeholder
Merge branch 'master' of https://github.com/claroline/CoreBundle
Merge pull request #52 from stefk/master

Removing placeholder
Texts can't be edited by everyone.
Merge branch 'master' of https://github.com/claroline/CoreBundle into text-edition

Conflicts:
	Resources/views/Text/index.html.twig
Merge pull request #53 from ngodfraind/text-edition

Texts can't be edited by everyone.
Fixing impersonation alert.
Merge pull request #56 from claroline/fixing-impersonation-alert

Fixing impersonation alert.
Temporarily locked lessphp to a working version
Merge branch 'master' of https://github.com/claroline/CoreBundle
Temporarily locked lessphp to a working version (2)
close claroline/Claroline#335
close claroline/Claroline#337 missing blank space
Merge pull request #57 from easy-es/forgot-password

close claroline/Claroline#337 missing blank space
Merge pull request #58 from easy-es/user-profile

close claroline/Claroline#335 form fields disabled fixed
Merge branch 'master' of https://github.com/claroline/CoreBundle into user-profile-pic

Conflicts:
	Controller/ProfileController.php