Merge branch 'hotfix/20141217-gamerch'
game
Merge branch 'hotfix/20141217-inside' into develop