Merge pull request #7 from lei-april/master

fix the bug with card editor
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from lei-april/master

fix some bugs
更改初始化方案；预置部分素材
Merge branch 'master' of github.com:DaiYue/xiaoyudi_iOS

Conflicts:
	iosapp.xcodeproj/project.pbxproj
	iosapp/HAMAppDelegate.m
修复了删除卡片的bug
Merge remote-tracking branch 'upstream/master'
修复添加卡片时只会加到第一位的Bug
Merge remote-tracking branch 'upstream/master'
some minor improvements