Merge branch 'master' of https://github.com/claroline/CoreBundle into admin-hometab-new-gui
Merge remote-tracking branch 'upstream/master'
Refactored hometab edition in workspace. Load another page for edition
Added separated pages for desktop home display and config
Merge branch 'master' of https://github.com/claroline/CoreBundle into 2-hometabs-pages

Conflicts:
	Controller/DesktopController.php
Fixed bug in desktop widget list with config
added button to reorder homeTab for admin desktop hometabs
Check workspace when whecking badge awarding rules respect
Added reorder for admin desktop home tabs
Added reorder for admin workspace home tabs
Added reorder for desktop and workspace home tabs
Fixing resource manager search.
GUI update + Theme generator Update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/views/Badge/Profile/claim.html.twig
	Resources/views/Profile/profile.html.twig
	Resources/views/Tool/desktop/home/desktopHomeTabs.html.twig
small changes
Fixing admin widgets configuration.
Merge pull request #83 from kitan1982/2-hometabs-pages

2 hometabs pages
Merge pull request #84 from maxailloud/badge-checking-on-workspace

Check workspace when whecking badge awarding rules respect
Translation update
Merge pull request #85 from kitan1982/reorder-hometab

Reorder hometab