Merge pull request #6 from Lsargent/Trunk

Trunk
Merge pull request #9 from Lsargent/Trunk

Trunk
Merge pull request #7 from Lsargent/Trunk

Trunk
3/20
Merge branch 'Trunk' of https://github.com/Kholiway/SdProject into Trunk

Conflicts:
	SdProject/Global.asax.cs

	new file:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	new file:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Controllers/HomeController.cs
	modified:   SdProject/Controllers/HouseController.cs
	new file:   SdProject/Controllers/ImageController.cs
	modified:   SdProject/Global.asax.cs
	modified:   SdProject/Models/HouseDisplayModel.cs
	new file:   SdProject/Models/ImageModel/UploadImage.cs
	new file:   SdProject/Scripts/jquery.imagedialog.js
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/House/EnterInfo.cshtml
	deleted:    SdProject/Views/House/UploadImage.cshtml
	new file:   SdProject/Views/Image/UploadImage.cshtml
	modified:   SdProject/Web.config
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Models/HouseDisplayModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/House/EnterInfo.cshtml
	new file:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/Views/House/EnterInfo.cshtml
	modified:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/CustomValidators/CustomValidator.cs
3/20
Message work
Merge pull request #25 from zyxxy/Trunk

Validators
Merge pull request #10 from Lsargent/Trunk

Trunk
Fixed view policy and friendship
Revert "	modified:   SdProject/CustomValidators/CustomValidator.cs"

This reverts commit 583931f91feb41a9dd91022a6890056b5c916bb0.
Revert "	modified:   SdProject/CustomValidators/CustomValidator.cs"

This reverts commit 1eff9cafc27576d09d8e78f5fea86ad97298cf8d.
Revert "Revert "	modified:   SdProject/CustomValidators/CustomValidator.cs""

This reverts commit 115a92224194a94689759d0efe576e49e0c4e177.
Revert "Revert "	modified:   SdProject/CustomValidators/CustomValidator.cs""

This reverts commit 64691b80b1e2e46081caabe81a20341130d3a8b2.
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/Models/HouseDisplayModel.cs