Merge branch 'hotfix/20141217-lineapps'
gache
Merge branch 'hotfix/20141217-gacha' into develop