modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Controllers/HomeController.cs
	modified:   SdProject/SdProject.csproj
	deleted:    SdProject/Views/Account/UploadImage.cshtml
	modified:   SdProject/Web.config
	SdProject/Controllers/ImageController.cs
	SdProject/Models/ImageModel/
	SdProject/Views/Image/
	new file:   SdProject/Controllers/ImageController.cs
	new file:   SdProject/Models/ImageModel/UploadImage.cs
	SdProject/Views/Image/
	new file:   SdProject/Views/Image/UploadImage.cshtml
Merge remote-tracking branch 'upstream/Trunk' into Trunk

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

	modified:   Logic/House.cs
	modified:   Logic/User.cs
	modified:   SdProject/Controllers/AccountController.cs
	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Controllers/MessageController.cs
	modified:   SdProject/Models/AccountModels/AccountModels.cs
	modified:   SdProject/Models/AccountModels/DisplayAccountInfoModel.cs
	modified:   SdProject/Models/HouseDisplayModel.cs
	modified:   SdProject/Models/MessageModels/MessageListingModel.cs
	modified:   SdProject/Models/MessageModels/MessageModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/PageView.cshtml
	modified:   SdProject/Views/Account/Register.cshtml
	modified:   SdProject/Views/House/EnterInfo.cshtml
	new file:   SdProject/Views/House/UploadImage.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Controllers/ImageController.cs
	modified:   SdProject/Global.asax.cs
	modified:   SdProject/SdProject.csproj
	deleted:    SdProject/Views/House/UploadImage.cshtml
	modified:   SdProject/Views/Image/UploadImage.cshtml
	new file:   SdProject/Scripts/jquery.imagedialog.js
Merge remote-tracking branch 'upstream/trunk' into Trunk

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

	modified:   .gitignore
	modified:   SdProject/Controllers/AccountController.cs
	modified:   SdProject/Models/AccountModels/AccountModels.cs
	renamed:    SdProject/Models/AccountModels/DisplayAccountInfoModel.cs -> SdProject/Models/AccountModels/DisplayAccountModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Manage.cshtml
	modified:   SdProject/Views/Account/PageView.cshtml
	modified:   SdProject/Views/Account/_ChangePasswordPartial.cshtml
	modified:   SdProject/Views/Account/_SetPasswordPartial.cshtml
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Views/Image/UploadImage.cshtml
Merge remote-tracking branch 'upstream/Trunk' into trunk
	modified:   SdProject/Views/Image/UploadImage.cshtml
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Models/HouseDisplayModel.cs
	modified:   SdProject/Views/House/EnterInfo.cshtml
Merge branch 'Trunk' of ssh://github.com/zyxxy/SdProject into Trunk