kl
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/Models/News/NewsHandle.cs
	TaxiFirm/TaxiFirm/Views/FrontPage/News.aspx
	TaxiFirm/TaxiFirm/Views/FrontPage/NewsContent.aspx
Merge branch 'master' of github.com:shawnjust/TaxiFirmManagmentSystem_new
正则表达式检查注册