Merge pull request #6 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
3/20
Merge branch 'Trunk' of https://github.com/Lsargent/SdProject into Lsargent-Trunk

Conflicts:
	SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	SdProject/Controllers/HouseController.cs
	SdProject/Models/HouseDisplayModel.cs

	modified:   SdProject/Controllers/HouseController.cs
	new file:   SdProject/CustomValidators/RoomsValidator.cs
	modified:   SdProject/Models/HouseDisplayModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/House/EnterInfo.cshtml
3/22
Merge pull request #28 from Kholiway/Trunk

Trunk