Merge branch 'hotfix/20141210-games2'
極限DB
Merge branch 'hotfix/20141211-block01' into develop