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:   DataAccess/DataAccess.csproj
	new file:   DataAccess/IRepositories/IImageRepository.cs
	new file:   DataAccess/IRepositories/IOwnedEntityRepository.cs
	new file:   DataAccess/Repositories/ImageRepository.cs
	new file:   DataAccess/Repositories/OwnedEntityRepository.cs
	modified:   Logic/Friendship.cs
	modified:   Logic/Image.cs
	modified:   Logic/Message.cs
	deleted:    SdProject/App_Data/1.jpeg
	deleted:    SdProject/App_Data/2.jpeg
	modified:   SdProject/Controllers/AccountController.cs
	modified:   SdProject/Controllers/FriendshipController.cs
	modified:   SdProject/Controllers/ImageController.cs
	modified:   SdProject/Controllers/MessageController.cs
	new file:   SdProject/Controllers/PermissionController.cs
	new file:   SdProject/Images/2.jpg
	new file:   SdProject/Images/3.jpg
	new file:   SdProject/Images/4.jpg
	modified:   SdProject/Models/AccountModels/ProfileModel.cs
	modified:   SdProject/Models/ImageModels/ImageDisplayModel.cs
	modified:   SdProject/Models/ImageModels/UploadImage.cs
	new file:   SdProject/Models/PermissionModels/PermissionModel.cs
	modified:   SdProject/Scripts/SlideFeature.js
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/Profile.cshtml
	modified:   SdProject/Views/Account/Register.cshtml
	modified:   SdProject/Views/Account/_ProfilePreview.cshtml
	modified:   SdProject/Views/Home/About.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	modified:   SdProject/Views/Image/_ImageDisplay.cshtml
	new file:   SdProject/Views/Permission/EditPermission.cshtml
	new file:   SdProject/Views/Permission/PermissionDisplay.cshtml
	new file:   SdProject/Views/Permission/_PermissionDisplay.cshtml
	new file:   SdProject/Views/Permission/_PermissionDisplayRoot.cshtml
	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/Profile.cshtml
	modified:   SdProject/Views/House/_House.cshtml
	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/Profile.cshtml
	modified:   SdProject/Views/House/_House.cshtml
	new file:   SdProject/Views/House/Edit.cshtml
Merge pull request #6 from zyxxy/master

Updating
Merge pull request #47 from zyxxy/Trunk

Edit house
	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/Views/House/Edit.cshtml
	modified:   SdProject/Views/House/EnterInfo.cshtml
	modified:   SdProject/Views/House/_House.cshtml
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
...
merge
Merge pull request #17 from Lsargent/Trunk

Trunk