work on #131
Merge branch 'master' of https://github.com/Heigvd/Wegas

Conflicts:
	wegas-app/src/main/webapp/wegas-editor/js/inputex/wegas-inputex-yui2rte.js

resolve conflict