Merge branch 'hotfix/20141217-gamew'
gamerch
Merge branch 'hotfix/20141217-gamerch' into develop