Merge pull request #20 from lei-april/master

fix more bugs
Merge pull request #21 from lei-april/master

fix some bugs and rearrange the resource files
更新最终素材，一些细节改动

更改loading页背景
默认布局改为2x2
3点提示改为60%透明度
执行SQL初始化改为复制db文件
增大文字按钮热区
将gif动画改为默认停留在最后一张
Merge branch 'master' of github.com:DaiYue/xiaoyudi_iOS

Conflicts:
	iosapp.xcodeproj/project.pbxproj
	iosapp/common/HAMCardView.m
remove some problematic cards according to Prof. Wei’s email