Fix last commit
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git

Conflicts:
	wegas-core/src/main/java/com/wegas/core/persistence/variable/scope/GameModelScope.java