allow post method
translation update/fix
Merge pull request #861 from arnaudbey/transl

translation update/fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Controller/Tool/RolesController.php
Merge pull request #862 from solispauwels/master

allow post method
translation update
es translation update
Merge pull request #863 from solispauwels/master

Translations update
remove useless paramater
Merge pull request #864 from arnaudbey/fiximport

remove useless paramater
Allows users registration from CSV via command line
Merge branch 'master' of https://github.com/claroline/CoreBundle into workspace-registration-csv
Adds more info messages
Merge branch 'master' of https://github.com/claroline/CoreBundle into importers

Conflicts:
	Controller/Tool/WorkspaceParametersController.php
checkstyle
Merge pull request #865 from kitan1982/workspace-registration-csv

Workspace registration from CSV via command line
Revert desktop changes.
Merge pull request #866 from ngodfraind/revert-desktop-layout-changes

Revert desktop changes.
Merge branch 'master' of https://github.com/claroline/CoreBundle into importers