1

1
Merge branch 'master' of https://github.com/tlsion/CommodityInspection

Conflicts:
	CIController/CIForgetViewController.h
	CIController/CIForgetViewController.m
	CIController/CIForgetViewController.xib
	CILibrary/TXLib/TXUtils/TXServiceURL.h
	CommodityInspection.xcodeproj/project.pbxproj