save
Merge branch 'master' of github.com:limijiaoyin/kuzhanggui-contents

Conflicts:
	base/resources.py