prepare to merge
Merge branch 'master' of https://github.com/tungha/gamelop12345 into online

Conflicts:
	DiamondTest-desktop/.lop_config/.LOP