modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
Merge remote-tracking branch 'upstream/Trunk'

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

	modified:   SdProject/App_Start/BundleConfig.cs
	new file:   SdProject/Content/Pics/pic09.jpg
	new file:   SdProject/Content/Pics/pic10.jpg
	new file:   SdProject/Content/Pics/pic11.jpg
	new file:   SdProject/Content/default.css
	modified:   SdProject/Controllers/HouseController.cs
	new file:   SdProject/CustomValidators/FileSizeAttribute.cs
	new file:   SdProject/CustomValidators/FileTypesAttribute.cs
	new file:   SdProject/Images/pic09.jpg
	new file:   SdProject/Images/pic10.jpg
	new file:   SdProject/Images/pic11.jpg
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	new file:   SdProject/Scripts/SlideFeature.js
	new file:   SdProject/Scripts/jquery.slidertron-1.1.js
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	new file:   SdProject/Views/House/UploadImage.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	new file:   SdProject/Views/Test.cshtml
	new file:   SdProject/Views/Test2.cshtml
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Content/default.css
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/Login.cshtml
Merge branch 'Trunk'

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

	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	deleted:    SdProject/Scripts/jquery.imagedialog.js
	modified:   SdProject/Web.config