Updated CEP-game to have a list of questions per period
Working Style and Client scripts
Removed old widgetsUri and cssUri in GameModel entity
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git

Conflicts:
	wegas-app/src/main/webapp/wegas-app/db/wegas-editor-layout.json
	wegas-app/src/main/webapp/wegas-app/js/persistence/wegas-entity.js
	wegas-app/src/main/webapp/wegas-leaderway/db/wegas-leaderway.json
	wegas-core/src/main/java/com/wegas/core/persistence/game/GameModel.java
FiX issue in last commit in GameModelFacade and VariableDescriptor
store swap status
Merge branch 'flexi'

* flexi:
  store swap status
Fix pages URI

* Made mixed xml/js IDE friendly (js commented XML)
app-default warn fix
mcq tabview gallery integration

*some gallery corrections
Added default path for jackrabbit
Added page serialization test
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-app/view/editor.xhtml
	wegas-app/src/main/webapp/wegas-app/view/template/app-default.xhtml
Refactor websocket
Merge remote-tracking branch 'origin/master' into securitywidget
Adapte gameModel