wertgh
sdfdg
gtrgtrg
freert
rrrrrrrrrrrrrrrrter
e32rr32r
detre
Merge branch 'master' of github.com:ausatov/SocialNetwork

Conflicts:
	.gitignore
	RuzWizardsSocialNetworkApplication.sln
	RuzWizardsSocialNetworkApplication/AdminPage.Master
	RuzWizardsSocialNetworkApplication/AdminPage.Master.cs
	RuzWizardsSocialNetworkApplication/Administration/Bans.aspx
	RuzWizardsSocialNetworkApplication/Administration/Bans.aspx.cs
	RuzWizardsSocialNetworkApplication/Administration/Bans.aspx.designer.cs
	RuzWizardsSocialNetworkApplication/Administration/RolesPage.aspx
	RuzWizardsSocialNetworkApplication/Administration/RolesPage.aspx.designer.cs
	RuzWizardsSocialNetworkApplication/Administration/Welcome.aspx
	RuzWizardsSocialNetworkApplication/App_Code/SessionHelper.cs
	RuzWizardsSocialNetworkApplication/App_Themes/BanPage/ban.css
	RuzWizardsSocialNetworkApplication/App_Themes/LoginPage/LoginPage.skin
	RuzWizardsSocialNetworkApplication/App_Themes/MainSkin/MainSkin.skin
	RuzWizardsSocialNetworkApplication/App_Themes/MainSkin/MainStyle.css
	RuzWizardsSocialNetworkApplication/App_Themes/MainSkin/SpecialStyles.css
	RuzWizardsSocialNetworkApplication/Constants/Constants.cs
	RuzWizardsSocialNetworkApplication/EditProfile.aspx
	RuzWizardsSocialNetworkApplication/EditProfile.aspx.cs
	RuzWizardsSocialNetworkApplication/Global.asax
	RuzWizardsSocialNetworkApplication/Global.asax.cs
	RuzWizardsSocialNetworkApplication/Login.aspx
	RuzWizardsSocialNetworkApplication/Login.aspx.cs
	RuzWizardsSocialNetworkApplication/Login.aspx.cs.orig
	RuzWizardsSocialNetworkApplication/Login.aspx.designer.cs
	RuzWizardsSocialNetworkApplication/LoginPage.master
	RuzWizardsSocialNetworkApplication/LoginPage.master.cs
	RuzWizardsSocialNetworkApplication/LoginPage.master.designer.cs
	RuzWizardsSocialNetworkApplication/Messages.aspx
	RuzWizardsSocialNetworkApplication/Messages.aspx.cs
	RuzWizardsSocialNetworkApplication/NewMessage.aspx
	RuzWizardsSocialNetworkApplication/NewMessage.aspx.cs
	RuzWizardsSocialNetworkApplication/NewMessage.aspx.designer.cs
	RuzWizardsSocialNetworkApplication/Properties/AssemblyInfo.cs
	RuzWizardsSocialNetworkApplication/RuzWizardsSocialNetworkApplication.csproj
	RuzWizardsSocialNetworkApplication/RuzWizardsSocialNetworkApplication.csproj.orig
	RuzWizardsSocialNetworkApplication/Scripts/LoginValidate.js
	RuzWizardsSocialNetworkApplication/Scripts/ajaxfunc.js
	RuzWizardsSocialNetworkApplication/Scripts/jquery-1.4.1-vsdoc.js
	RuzWizardsSocialNetworkApplication/Scripts/jquery-1.4.1.js
	RuzWizardsSocialNetworkApplication/Scripts/jquery-1.4.1.min.js
	RuzWizardsSocialNetworkApplication/Styles/Site.css
	RuzWizardsSocialNetworkApplication/Styles/jQueryUI.css
	RuzWizardsSocialNetworkApplication/Uploads/Photo/e80cd2ac-8517-4e95-8321-3f4593d2106a.jpg
	RuzWizardsSocialNetworkApplication/UserControls/PrivateMessageItem.ascx
	RuzWizardsSocialNetworkApplication/UserControls/PrivateMessageItem.ascx.cs
	RuzWizardsSocialNetworkApplication/UserControls/PrivateMessageItem.ascx.designer.cs
	RuzWizardsSocialNetworkApplication/UserPage.master
	RuzWizardsSocialNetworkApplication/UserPage.master.cs
	RuzWizardsSocialNetworkApplication/UserPage.master.designer.cs
	RuzWizardsSocialNetworkApplication/UserProfile.aspx
	RuzWizardsSocialNetworkApplication/UserProfile.aspx.cs
	RuzWizardsSocialNetworkApplication/UserProfile.aspx.designer.cs
	RuzWizardsSocialNetworkApplication/Web.Debug.config
	RuzWizardsSocialNetworkApplication/Web.Release.config
	RuzWizardsSocialNetworkApplication/Web.config
	RuzWizardsSocialNetworkApplication/WebServices/FillItemsService.asmx.cs
	RuzWizardsSocialNetworkApplication/WebServices/ModifyService.asmx.cs
	RuzWizardsSocialNetworkApplication/WebServices/SocialNetworkService.asmx.cs
	SocialNetwork.DataAccess/App.Config
	SocialNetwork.DataAccess/Entity/Message.cs
	SocialNetwork.DataAccess/Enums/EnumsHelper.cs
	SocialNetwork.DataAccess/IStatusRepository.cs
	SocialNetwork.DataAccess/Properties/AssemblyInfo.cs
	SocialNetwork.DataAccess/Repositories/AddressRepository.cs
	SocialNetwork.DataAccess/Repositories/BanRepository.cs
	SocialNetwork.DataAccess/Repositories/FriendInvitationsRepository.cs
	SocialNetwork.DataAccess/Repositories/FriendRepository.cs
	SocialNetwork.DataAccess/Repositories/MessageRepository.cs
	SocialNetwork.DataAccess/Repositories/PersonalInfoRepository.cs
	SocialNetwork.DataAccess/Repositories/StatusRepository.cs
	SocialNetwork.DataAccess/Repositories/UserRepository.cs
	SocialNetwork.DataAccess/Repositories/UserRoleRepository.cs
	SocialNetwork.DataAccess/Repositories/WallBoardItemRepository.cs
	SocialNetwork.DataAccess/SocialNetwork.DataAccess.csproj
	SocialNetwork.DataAccess/SocialNetworkDB.Designer.cs
	SocialNetwork.DataAccess/SocialNetworkDB.edmx