Merge pull request #5 from lei-april/master

edit the image names used in Lei’s part
Merge pull request #6 from lei-april/master

Remove the use of popovers
更新图片为压缩后版本
Merge branch 'master' of github.com:DaiYue/xiaoyudi_iOS

Conflicts:
iosapp.xcodeproj/project.pbxproj
iosapp/resources/lib/cancel.png
iosapp/resources/lib/card.png
iosapp/resources/lib/category.png
iosapp/resources/lib/edit.png
Merge branch 'master' of github.com:DaiYue/xiaoyudi_iOS

Conflicts:
	iosapp.xcodeproj/project.pbxproj
	iosapp/resources/lib/cancel.png
	iosapp/resources/lib/edit.png
fix some bugs
before merging
Merge remote-tracking branch 'upstream/master'
fix the bug with card editor