init base

unknown save
Merge remote-tracking branch 'origin/master'

Conflicts:
	Layouts/level4.uistate.xml
	kancil.caproj
	kancil.capx.backup1