Small ui fixes
Merge branch 'master' into ui-fixes
Merge pull request #421 from solispauwels/master

bug fix + new resources icons
wip
Merge branch 'master' into ui-fixes
Changed wording and disabled workspace search tab
Fixing my workspace list.
Merge branch 'master' of github.com:claroline/CoreBundle into default-resource-perms

Conflicts:
	Library/Installation/Updater/Updater021000.php
Merge pull request #422 from stefk/ui-fixes

Small UI fixes
Merge pull request #423 from ngodfraind/default-resource-perms

Default resource perms
Merge remote-tracking branch 'upstream/master'