Merge branch 'syqnew-master7'
Merge branch 'master' of https://github.com/GoogleJump/Diversity