Added game scope
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git

Conflicts:
	wegas-app/src/main/webapp/wegas-app/js/widget/wegas-button.js
	wegas-core/src/main/java/com/wegas/core/persistence/variable/primitive/NumberDescriptor.java
Fix choicedescriptor duplication
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git