孙栋炼 model
Merge branch 'nz' of github.com:yby415098820/nz into nz

Conflicts:
	app/Model/ModelManager.lua
	app/MyApp.lua
	app/guide/GuideLayer.lua