Merge branch 'hotfix/20141217-gacha'
dixq
Merge branch 'hotfix/20141217-dixq' into develop