bug修改
Merge branch 'master' of https://github.com/UniCloud/FRP

Conflicts:
	Infrastructure.Data.UberModel/Migrations/201406300538297_database.Designer.cs
	Infrastructure.Data.UberModel/Migrations/201406300538297_database.cs
	Infrastructure.Data.UberModel/Migrations/201407010619379_Initial.Designer.cs
	Infrastructure.Data.UberModel/Migrations/201407010619379_Initial.cs
	Infrastructure.Data.UberModel/Migrations/201407010759565_database.Designer.cs
	Infrastructure.Data.UberModel/Migrations/201407010759565_database.cs
	Infrastructure.Data.UberModel/Migrations/201407010759565_database.resx