Merge pull request #17 from lei-april/master

some bugs fixed
Merge pull request #18 from lei-april/master

can handle multi-resolution pictures now
增加初始化loading界面，增加分类动画
Merge pull request #19 from lei-april/master

update the category editor view
更改新建课件背景，取消1x1时会缩小的动画
commit
Merge branch 'master' of github.com:DaiYue/xiaoyudi_iOS

Conflicts:
	iosapp.xcodeproj/project.pbxproj
	iosapp/common/HAMCardView.m
更改EditCatPopover中的进入素材库编辑

改为调用categoryEditor
禁止进入素材库编辑自带素材
fix more bugs