modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
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:   DataAccess/IRepositories/IUserRepository.cs
	modified:   DataAccess/Repositories/RepositoryBase.cs
	modified:   DataAccess/Repositories/UserRepository.cs
	modified:   DataAccess/SdDb.cs
	modified:   Logic/Address.cs
	modified:   Logic/BaseComponent.cs
	modified:   Logic/Entity.cs
	modified:   Logic/EntityChange.cs
	modified:   Logic/Friendship.cs
	new file:   Logic/Helpers/ChangeTracker.cs
	new file:   Logic/Helpers/PermissionHelper.cs
	modified:   Logic/House.cs
	modified:   Logic/IObjectState.cs
	modified:   Logic/Image.cs
	modified:   Logic/Logic.csproj
	modified:   Logic/Message.cs
	modified:   Logic/MessageThread.cs
	modified:   Logic/OperationStatus.cs
	modified:   Logic/OwnedEntity.cs
	modified:   Logic/OwnedEntityChange.cs
	modified:   Logic/User.cs
	new file:   Logic/UserOwnedEntity.cs
	modified:   SdProject/App_Start/BundleConfig.cs
	modified:   SdProject/App_Start/RouteConfig.cs
	new file:   SdProject/Content/Pics/pic09.jpg
	new file:   SdProject/Content/Pics/pic10.jpg
	new file:   SdProject/Content/Pics/pic11.jpg
	modified:   SdProject/Content/Site.css
	new file:   SdProject/Content/default.css
	modified:   SdProject/Controllers/AccountController.cs
	new file:   SdProject/Controllers/AddressController.cs
	new file:   SdProject/Controllers/BaseComponentController.cs
	new file:   SdProject/Controllers/FriendsController.cs
	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Controllers/MessageController.cs
	new file:   SdProject/Controllers/MessageTreadController.cs
	new file:   SdProject/CustomValidators/FileSizeAttribute.cs
	new file:   SdProject/CustomValidators/FileTypesAttribute.cs
	deleted:    SdProject/Images/accent.png
	deleted:    SdProject/Images/heroAccent.png
	new file:   SdProject/Images/logo.jpg
	new file:   SdProject/Images/pic09.jpg
	new file:   SdProject/Images/pic10.jpg
	new file:   SdProject/Images/pic11.jpg
	renamed:    SdProject/Models/AccountModels/DisplayAccountModel.cs -> SdProject/Models/AccountModels/AccountDisplayModel.cs
	new file:   SdProject/Models/AccountModels/ProfileModel.cs
	new file:   SdProject/Models/AddressModels/AddressDisplayModel.cs
	deleted:    SdProject/Models/AddressModels/DisplayAddressModel.cs
	new file:   SdProject/Models/FriendshipModels/FriendshipDisplayModel.cs
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	new file:   SdProject/Models/HouseModels/HousePreviewModel.cs
	new file:   SdProject/Models/ImageModels/ImageDisplayModel.cs
	renamed:    SdProject/Models/ImageModel/UploadImage.cs -> SdProject/Models/ImageModels/UploadImage.cs
	renamed:    SdProject/Models/MessageModels/DisplayMessageModel.cs -> SdProject/Models/MessageModels/MessageDisplayModel.cs
	modified:   SdProject/Models/MessageModels/MessageListingModel.cs
	new file:   SdProject/Scripts/SlideFeature.js
	deleted:    SdProject/Scripts/jquery.imagedialog.js
	new file:   SdProject/Scripts/jquery.slidertron-1.1.js
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/Login.cshtml
	modified:   SdProject/Views/Account/PageView.cshtml
	new file:   SdProject/Views/Account/Profile.cshtml
	new file:   SdProject/Views/Account/ProfileNotFound.cshtml
	modified:   SdProject/Views/Account/Register.cshtml
	deleted:    SdProject/Views/Account/_DisplayAccountInfo.cshtml
	new file:   SdProject/Views/Address/_SmallAddressDisplay.cshtml
	modified:   SdProject/Views/Home/About.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	new file:   SdProject/Views/House/UploadImage.cshtml
	modified:   SdProject/Views/House/_House.cshtml
	new file:   SdProject/Views/House/_HousePreview.cshtml
	new file:   SdProject/Views/House/_HousePreviewRoot.cshtml
	new file:   SdProject/Views/Image/_ImageDisplay.cshtml
	modified:   SdProject/Views/Message/Create.cshtml
	new file:   SdProject/Views/Message/DisplayMessage.cshtml
	modified:   SdProject/Views/Message/Edit.cshtml
	deleted:    SdProject/Views/Message/_Create.cshtml
	new file:   SdProject/Views/Message/_CreateMessage.cshtml
	new file:   SdProject/Views/Message/_CreateMessageFormContent.cshtml
	modified:   SdProject/Views/Message/_DisplayMessage.cshtml
	modified:   SdProject/Views/Message/_DisplayMessageBody.cshtml
	new file:   SdProject/Views/Message/_DisplayMessageRoot.cshtml
	modified:   SdProject/Views/Message/_DisplayMessageSubject.cshtml
	modified:   SdProject/Views/Message/_EditMessageBody.cshtml
	modified:   SdProject/Views/Message/_EditMessageSubject.cshtml
	modified:   SdProject/Views/Message/_Listing.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	modified:   SdProject/Views/Shared/_LoginPartial.cshtml
	new file:   SdProject/Views/Test.cshtml
	new file:   SdProject/Views/Test2.cshtml
	modified:   SdProject/Web.config
Merge pull request #16 from Lsargent/Trunk

Trunk
just need to finish feed
...
merge
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:   DataAccess/DataAccess.csproj
	new file:   DataAccess/IRepositories/IAddressRepository.cs
	new file:   DataAccess/IRepositories/IFriendshipRepository.cs
	new file:   DataAccess/IRepositories/IImageRepository.cs
	new file:   DataAccess/IRepositories/IOwnedEntityRepository.cs
	new file:   DataAccess/Repositories/AddressRepository.cs
	new file:   DataAccess/Repositories/FriendshipRepository.cs
	new file:   DataAccess/Repositories/ImageRepository.cs
	new file:   DataAccess/Repositories/OwnedEntityRepository.cs
	modified:   DataAccess/SdDb.cs
	modified:   Logic/Address.cs
	new file:   Logic/Extensions/StringExtension.cs
	modified:   Logic/Friendship.cs
	modified:   Logic/Helpers/PermissionHelper.cs
	modified:   Logic/Image.cs
	modified:   Logic/Logic.csproj
	modified:   Logic/Message.cs
	modified:   Logic/User.cs
	modified:   SdProject/Content/Site.css
	modified:   SdProject/Controllers/AccountController.cs
	modified:   SdProject/Controllers/AddressController.cs
	deleted:    SdProject/Controllers/FriendsController.cs
	new file:   SdProject/Controllers/FriendshipController.cs
	new file:   SdProject/Controllers/HfController.cs
	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Controllers/ImageController.cs
	modified:   SdProject/Controllers/MessageController.cs
	renamed:    SdProject/Controllers/MessageTreadController.cs -> SdProject/Controllers/MessageThreadController.cs
	new file:   SdProject/Controllers/PermissionController.cs
	modified:   SdProject/CustomValidators/FileSizeAttribute.cs
	modified:   SdProject/CustomValidators/FileTypesAttribute.cs
	modified:   SdProject/Global.asax.cs
	new file:   SdProject/Images/1/Chrysanthemum.jpg
	new file:   SdProject/Images/1/Hydrangeas.jpg
	new file:   SdProject/Images/1/Jellyfish.jpg
	new file:   SdProject/Images/1/Penguins.jpg
	new file:   SdProject/Images/2.jpg
	new file:   SdProject/Images/3.jpg
	new file:   SdProject/Images/4.jpg
	new file:   SdProject/Images/5/Hydrangeas.jpg
	new file:   SdProject/Images/5/Jellyfish.jpg
	new file:   SdProject/Images/5/Tulips.jpg
	new file:   SdProject/Images/addpic.jpg
	modified:   SdProject/Models/AccountModels/AccountDisplayModel.cs
	deleted:    SdProject/Models/AccountModels/EditAddressModels.cs
	modified:   SdProject/Models/AccountModels/ProfileModel.cs
	new file:   SdProject/Models/AccountModels/ProfilePreviewModel.cs
	deleted:    SdProject/Models/AddressModels/AddressDisplayModel.cs
	new file:   SdProject/Models/AddressModels/AddressModel.cs
	deleted:    SdProject/Models/AddressModels/CreateAddressModel.cs
	new file:   SdProject/Models/FriendshipModels/CreateFriendshipModel.cs
	deleted:    SdProject/Models/FriendshipModels/FriendshipDisplayModel.cs
	new file:   SdProject/Models/FriendshipModels/FriendshipModel.cs
	new file:   SdProject/Models/FriendshipModels/ProfileFriendshipModel.cs
	renamed:    SdProject/Models/HouseModels/HouseDisplayModel.cs -> SdProject/Models/HouseModels/EnterInfoModel.cs
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	modified:   SdProject/Models/HouseModels/HousePreviewModel.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/PageView.cshtml
	modified:   SdProject/Views/Account/Profile.cshtml
	modified:   SdProject/Views/Account/Register.cshtml
	new file:   SdProject/Views/Account/_FeedPreview.cshtml
	new file:   SdProject/Views/Account/_ProfilePreview.cshtml
	new file:   SdProject/Views/Address/Create.cshtml
	new file:   SdProject/Views/Address/Display.cshtml
	new file:   SdProject/Views/Address/Edit.cshtml
	modified:   SdProject/Views/Address/_SmallAddressDisplay.cshtml
	new file:   SdProject/Views/Friendship/Create.cshtml
	modified:   SdProject/Views/Home/About.cshtml
	modified:   SdProject/Views/Home/Index.cshtml
	new file:   SdProject/Views/House/Edit.cshtml
	modified:   SdProject/Views/House/EnterInfo.cshtml
	deleted:    SdProject/Views/House/UploadImage.cshtml
	modified:   SdProject/Views/House/_House.cshtml
	modified:   SdProject/Views/House/_HousePreview.cshtml
	modified:   SdProject/Views/Image/UploadImage.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
	new file:   SdProject/Views/Shared/NoEditPermission.cshtml
	modified:   SdProject/Views/Shared/_Layout.cshtml
	modified:   SdProject/Views/Shared/_LoginPartial.cshtml
	modified:   SdProject/Web.config