Merge branch 'hotfix/20141216-game'
WonderPlanet
Merge branch 'hotfix/20141217-gamew' into develop