Merge branch 'hotfix/20141031-linegame'
lol musium
Merge branch 'hotfix/20141031-lol' into develop