增加发票种类界面
Merge branch 'master' of https://github.com/TuangWang/Tax

Conflicts:
	TaxApp.xcodeproj/project.pbxproj