thegame
Merge branch 'hotfix/20140610-thegame'