Small fix in prog game
Few update in pmg datatables
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git

Conflicts:
	wegas-app/src/main/webapp/wegas-pmg/js/plugin/wegas-pmg-occupationcolor.js
	wegas-app/src/main/webapp/wegas-pmg/js/plugin/wegas-pmg-tablepopup.js
	wegas-app/src/main/webapp/wegas-pmg/js/wegas-pmg-datatable.js
Refactor to new wegas-lobby package and PopupContent to Panel
Fix #312 @laggery On doit resauvegarder les impacts concernés
Fix #298
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git

Conflicts:
	wegas-app/src/main/webapp/wegas-app/js/wegas-loader.js
	wegas-app/src/main/webapp/wegas-pmg/js/plugin/wegas-pmg-assignment.js
	wegas-app/src/main/webapp/wegas-resourceManagement/js/wegas-resourceManagement-entities.js