Merge branch 'hotfix/20141216-tv2'
ponos.co.jp
Merge branch 'hotfix/20141216-game' into develop