Conflicts:
	total/GTOApp/Business/Repair/Views/GTOLicenceBoltView.m
	total/Info.plist
	total/Macro/GTOAppMacro.h