synchro master
Merge remote-tracking branch 'upstream/master'
fetch upstream/master
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