Merge branch 'master' of https://github.com/Heigvd/Wegas into pmg
adapte pmg game model
Entities structure changes
entities structure changes (2)
resolves conflict
Change entites task, assignement and ressource
Resolve conflict
Resolve conflict
Changes on Leaderway entities
Merge branch 'master' of https://github.com/Heigvd/Wegas into pmg
Test and correct resources/tasks
Merge branch 'master' of https://github.com/Heigvd/Wegas into pmg
test and correct resources/tasks
resolve conflicts
Merge branch 'master' of https://github.com/Heigvd/Wegas into pmg
adapte PMG game model
Adapte CEP game
Adapte Leaderway GameModel (without dialogues)
Adapte Leaderway entities (beginning) and tasklist widget
Adapte Leaderway gameModel and server-js