clear
zzh
wh
Merge branch 'wanghao' into dev

Conflicts:
	src/com/company/Main.java