modified:   SdProject/Views/Account/PageView.cshtml
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	SdProject/CustomValidators/MaxRoomsAttribute.cs
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
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/Repositories/RepositoryBase.cs
	modified:   DataAccess/SdDb.cs
	deleted:    Logic/FriendStatus.cs
	renamed:    Logic/Friend.cs -> Logic/Friendship.cs
	modified:   Logic/Logic.csproj
	modified:   Logic/Message.cs
	modified:   Logic/OwnedEntity.cs
	modified:   Logic/OwnedEntityChange.cs
	modified:   Logic/User.cs
	deleted:    Logic/ViewPolicy.cs
	modified:   SdProject/Content/Site.css
	modified:   SdProject/Controllers/AccountController.cs
	modified:   SdProject/Controllers/HouseController.cs
	modified:   SdProject/Controllers/MessageController.cs
	new file:   SdProject/CustomValidators/CustomValidator.cs
	modified:   SdProject/Global.asax.cs
	modified:   SdProject/Models/AccountModels/DisplayAccountModel.cs
	new file:   SdProject/Models/AccountModels/EditAddressModels.cs
	new file:   SdProject/Models/AddressModels/CreateAddressModel.cs
	new file:   SdProject/Models/AddressModels/DisplayAddressModel.cs
	deleted:    SdProject/Models/HouseDisplayModel.cs
	new file:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	modified:   SdProject/Models/MessageModels/CreateMessageModel.cs
	modified:   SdProject/Models/MessageModels/DisplayMessageModel.cs
	deleted:    SdProject/Models/MessageModels/EditMessageModel.cs
	new file:   SdProject/Models/MessageModels/EditMessageModels.cs
	modified:   SdProject/Models/MessageModels/MessageListingModel.cs
	modified:   SdProject/SdProject.csproj
	modified:   SdProject/Views/Account/PageView.cshtml
	modified:   SdProject/Views/Account/Register.cshtml
	modified:   SdProject/Views/House/EnterInfo.cshtml
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035.mdf
	modified:   SdProject/App_Data/aspnet-SdProject-2013011612035_log.ldf
	modified:   SdProject/Models/HouseModels/HouseDisplayModel.cs
Merge pull request #33 from zyxxy/Trunk

Fixed naming conventions, added ability to print multiple houses.