Merge branch 'hotfix/20140708-playtomic'
CHOというゲーム関連
Merge branch 'hotfix/20140710-cho' into develop