User Service
Merge branch 'master' of github.com:davidein/Ru.GameSchool

Conflicts:
	Local.testsettings
	Ru.GameSchool.BusinessLayer/Diagrams/GameSchool.cd
	Ru.GameSchool.BusinessLayer/Ru.GameSchool.BusinessLayer.csproj
	Ru.GameSchool.BusinessLayer/Services/BaseService.cs
	Ru.GameSchool.BusinessLayer/Services/CommentService.cs
	Ru.GameSchool.BusinessLayer/Services/CourseService.cs
	Ru.GameSchool.BusinessLayer/Services/GameService.cs
	Ru.GameSchool.BusinessLayer/Services/LevelService.cs
	Ru.GameSchool.BusinessLayer/Services/NotificationService.cs
	Ru.GameSchool.BusinessLayer/Services/UserService.cs
	Ru.GameSchool.BusinessLayerTests/Classes/FakeObjectSet.cs
	Ru.GameSchool.BusinessLayerTests/Properties/AssemblyInfo.cs
	Ru.GameSchool.BusinessLayerTests/Ru.GameSchool.BusinessLayerTests.csproj
	Ru.GameSchool.BusinessLayerTests/UserServiceTest.cs
	Ru.GameSchool.BusinessLayerTests/packages.config
	Ru.GameSchool.DataLayer/App.config
	Ru.GameSchool.DataLayer/Repository/Comment.cs
	Ru.GameSchool.DataLayer/Repository/CommentLike.cs
	Ru.GameSchool.DataLayer/Repository/ContentType.cs
	Ru.GameSchool.DataLayer/Repository/Course.cs
	Ru.GameSchool.DataLayer/Repository/CourseGrade.cs
	Ru.GameSchool.DataLayer/Repository/Department.cs
	Ru.GameSchool.DataLayer/Repository/GameSchool.Context.Interface.cs
	Ru.GameSchool.DataLayer/Repository/GameSchool.Context.Interface.tt
	Ru.GameSchool.DataLayer/Repository/GameSchool.Context.cs
	Ru.GameSchool.DataLayer/Repository/GameSchool.Context.tt
	Ru.GameSchool.DataLayer/Repository/GameSchool.Designer.cs
	Ru.GameSchool.DataLayer/Repository/GameSchool.cs
	Ru.GameSchool.DataLayer/Repository/GameSchool.edmx
	Ru.GameSchool.DataLayer/Repository/GameSchool.tt
	Ru.GameSchool.DataLayer/Repository/Level.cs
	Ru.GameSchool.DataLayer/Repository/LevelExam.cs
	Ru.GameSchool.DataLayer/Repository/LevelExamAnswer.cs
	Ru.GameSchool.DataLayer/Repository/LevelExamQuestion.cs
	Ru.GameSchool.DataLayer/Repository/LevelExamResult.cs
	Ru.GameSchool.DataLayer/Repository/LevelMaterial.cs
	Ru.GameSchool.DataLayer/Repository/LevelProject.cs
	Ru.GameSchool.DataLayer/Repository/LevelProjectResult.cs
	Ru.GameSchool.DataLayer/Repository/Notification.cs
	Ru.GameSchool.DataLayer/Repository/Point.cs
	Ru.GameSchool.DataLayer/Repository/Status.cs
	Ru.GameSchool.DataLayer/Repository/UserInfo.cs
	Ru.GameSchool.DataLayer/Repository/UserLog.cs
	Ru.GameSchool.DataLayer/Repository/UserType.cs
	Ru.GameSchool.DataLayer/Ru.GameSchool.DataLayer.csproj
	Ru.GameSchool.Web/Controllers/HomeController.cs
	Ru.GameSchool.Web/Views/Admin/EditUser.cshtml
	Ru.GameSchool.Web/Views/Admin/Index.cshtml
	Ru.GameSchool.Web/Views/Admin/_AdminSideBar.cshtml
	Ru.GameSchool.Web/Views/Home/About.cshtml
	Ru.GameSchool.Web/Views/Home/Material.cshtml
	Ru.GameSchool.Web/Views/Home/MaterialList.cshtml
	Ru.GameSchool.Web/Views/Home/Message.cshtml
	Ru.GameSchool.Web/Views/Home/Messages.cshtml
	Ru.GameSchool.Web/Views/Home/Project.cshtml
	Ru.GameSchool.Web/Views/Home/Projects.cshtml
	Ru.GameSchool.Web/Views/Home/_HomeSideBar.cshtml
	Ru.GameSchool.Web/bootstrap/css/bootstrap-extras.css
	Ru.GameSchool.vsmdi
	TraceAndTestImpact.testsettings
	packages/RhinoMocks.3.6.1/lib/net/Rhino.Mocks.xml
	packages/repositories.config