clean
Merge branch 'chordMerge' of https://github.com/tungha/DiamondTest
fix client act after game over
fix manifest
Merge branch 'chordMerge' of https://github.com/tungha/DiamondTest
fix fade problem
Merge branch 'master' of https://github.com/tungha/DiamondTest into chordMerge