synchro master
Merge remote-tracking branch 'upstream/master'
fetch upstream/master
Various bugfixes (closes #237, closes #236, closes #233)
Removing a useless semi colon.
Merge pull request #238 from ngodfraind/bugfix

Various bugfixes (closes #237, closes #236, closes #233)
close #218
icap restore upgrade
Merge remote-tracking branch 'upstream/master' into input-search

Conflicts:
	src/core/Claroline/CoreBundle/Resources/views/Tool/workspace/roles/workspaceUsers.html.twig
merged with master
Merge pull request #240 from easy-es/input-search

input search form : validate when "enter key " is pressed & previous result from the search
Themes update & Theme generator to bootstrap3
Theme Generator update (move some files)
Merge pull request #241 from solispauwels/GUI

Themes update & Theme generator to bootstrap3
bug fix
Merge pull request #242 from solispauwels/GUI

bug fix in data fixture
GUI update
Merge pull request #244 from solispauwels/GUI

GUI update
Merge remote-tracking branch 'upstream/master' into bugfix
Fixing XML encoding.