Merge remote-tracking branch 'upstream/master'
Fixed email bug in users import. Closes #192
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix
Correcting coding style
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/core/Claroline/CoreBundle/Resources/views/Administration/registrationManagementSelectedWorkspacesAndRoles.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceGroups.html.twig
	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceUsers.html.twig
Merge pull request #199 from maxailloud/master

Correcting coding style
Fixing checkstyle for dnd.js
dnd.js => dragndrop.js
Fixing RegistrationControllerTest
Merge pull request #200 from ngodfraind/bugfix

Fixing checkstyle for dnd.js
Added explanation for users import
Merge remote-tracking branch 'upstream/master' into user-csv-bug-fix
Closes #190
Reorganize topbar and correct it
Merge remote-tracking branch 'upstream/master'
Re-adding link to badge admin in menu + correct strict dispatcher name in logController + correct simpleautocomplete template after merge
Readd translation
Correct flash_message style for error message, danger now and not error anymore
Readd variable format to simpleautocomplete field form