jack commit
Merge branch 'master' of https://github.com/hongmomanu/Zsmzj

Conflicts:
	data/zsmzj.db3
Merge branch 'master' of https://github.com/hongmomanu/Zsmzj

Conflicts:
	data/zsmzj.db3
Merge branch 'master' of https://github.com/hongmomanu/Zsmzj

Conflicts:
	data/zsmzj.db3
Merge branch 'master' of https://github.com/hongmomanu/Zsmzj

Conflicts:
	data/zsmzj.db3
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/zsmzj.db3
dekete
Merge remote-tracking branch 'origin/master'
dekete