Complain模块 图片上传
Merge branch 'master' of github.com:shawnjust/TaxiFirmManagmentSystem_new

Conflicts:
	TaxiFirm/TaxiFirm/Controllers/FrontPageController.cs
	TaxiFirm/TaxiFirm/Models/DataClasses1.dbml
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs
	TaxiFirm/TaxiFirm/Views/FrontPage/Complain.aspx
MERGE BUG FIX
Merge branch 'master' of https://github.com/shawnjust/TaxiFirmManagmentSystem_new

Merge Again
Conflicts:
	TaxiFirm/TaxiFirm/Controllers/FrontPageController.cs
	TaxiFirm/TaxiFirm/Controllers/HomeController.cs
	TaxiFirm/TaxiFirm/Models/DataClasses1.dbml
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs.orig
	TaxiFirm/TaxiFirm/Models/Driver/DriverHandle.cs
	TaxiFirm/TaxiFirm/TaxiFirm.csproj
	TaxiFirm/TaxiFirm/Views/FrontPage/Complain.aspx
	TaxiFirm/TaxiFirm/Views/Home/AddDriver.aspx
	TaxiFirm/TaxiFirm/Views/Home/AddHost.aspx
	TaxiFirm/TaxiFirm/Views/Shared/Site.Master
Merge
Merge branch 'master' of github.com:shawnjust/TaxiFirmManagmentSystem_new

Conflicts:
	TaxiFirm/TaxiFirm/Controllers/HomeController.cs
	TaxiFirm/TaxiFirm/Controllers/HomeController.cs.orig
	TaxiFirm/TaxiFirm/Models/DataClasses1.dbml
	TaxiFirm/TaxiFirm/Models/DataClasses1.dbml.orig
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs.orig
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs.orig.orig
	TaxiFirm/TaxiFirm/TaxiFirm.csproj
	TaxiFirm/TaxiFirm/Views/Shared/Site.Master
	TaxiFirm/TaxiFirm/Views/Shared/Site.Master.orig
后台身份验证
Merge branch 'master' of github.com:shawnjust/TaxiFirmManagmentSystem_new

Conflicts:
	TaxiFirm/TaxiFirm/Controllers/FrontPageController.cs
	TaxiFirm/TaxiFirm/Controllers/FrontPageController.cs.orig
	TaxiFirm/TaxiFirm/Models/DataClasses1.dbml.layout
	TaxiFirm/TaxiFirm/Models/DataClasses1.dbml.orig
	TaxiFirm/TaxiFirm/Models/DataClasses1.designer.cs.orig
merge err fix
Merge branch 'master' of github.com:shawnjust/TaxiFirmManagmentSystem_new