Huge code push
Merge branch 'master' of https://github.com/KloudGame/CJ_Test