Merge branch 'master' of github.com:claroline/CoreBundle into bugfix
Fix GUI mistake
Merge pull request #495 from solispauwels/master

Fix GUI mistake
Template locator bug fix
Merge pull request #496 from solispauwels/master

Template locator bug fix
Merge branch 'master' of github.com:claroline/CoreBundle into bugfix
Fixing user search in workspaces.
Merge pull request #498 from ngodfraind/bugfix

Bugfix