[PMG] minor changes in scripts
fix conflict
Merge branch 'master' of https://github.com/Heigvd/Wegas

Conflicts:
	wegas-app/src/main/webapp/wegas-pmg/scripts/server-scripts/wegas-pmg-server-util.js