4/27
Merge branch 'Trunk' of https://github.com/Kholiway/SdProject into Trunk

Conflicts:
	SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf

	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Models/HouseModels/EnterInfoModel.cs
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/PageView.cshtml
	modified:   SdProject/Views/Account/Profile.cshtml
	new file:   SdProject/Views/House/Edit.cshtml
	modified:   SdProject/Views/House/EnterInfo.cshtml
	modified:   SdProject/Views/House/_House.cshtml