Merge pull request #16 from lei-april/master

improve the category editing view
加入3点提示，预置大部分图片素材
Merge branch 'master' of github.com:DaiYue/xiaoyudi_iOS

Conflicts:
	iosapp.xcodeproj/project.pbxproj
some bugs fixed