Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git

Conflicts:
	wegas-app/src/main/webapp/wegas-editor/js/inputex/wegas-inputex-variabledescriptorselect.js
Fix issue in last commit
Merge branch 'master' of github.com:Heigvd/Wegas