Merge branch 'master' of github.com:claroline/CoreBundle into bugfix
Adding new resource icons for open office documents.
Fixing updater.
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
Merge pull request #494 from ngodfraind/docx-thumbnails

Adding new resource icons for open office documents.
Fixing findByMimeTypeAndParent.
Removing useless code.
Merge pull request #499 from ngodfraind/bugfix

Bugfix
Merge branch 'master' of https://github.com/claroline/CoreBundle into HEAD
workspaces managements |data|creator|nbr subscriber