Merged with master to get updates
Refactored Filter methods and Int-tests
removed FluentAssertions.cs from the tests
Solved problems with color
Merge branch 'origin/saveli'

Conflicts:
	Bs.Calendar.DataAccess/Bases/CalendarContext.cs
	Bs.Calendar.DataAccess/Bases/RepoUnit.cs
	Bs.Calendar.DataAccess/Bs.Calendar.DataAccess.csproj
	Bs.Calendar.Models/Bs.Calendar.Models.csproj
	Bs.Calendar.Mvc/Bs.Calendar.Mvc.csproj
	Bs.Calendar.Mvc/Controllers/RoomController.cs
	Bs.Calendar.Mvc/Controllers/UsersController.cs
	Bs.Calendar.Mvc/Scripts/Rooms/SetupEvents.js
	Bs.Calendar.Mvc/Server/BundleConfig.cs
	Bs.Calendar.Mvc/Services/RoomService.cs
	Bs.Calendar.Mvc/Services/UserService.cs
	Bs.Calendar.Mvc/ViewModels/RoomEditVm.cs
	Bs.Calendar.Mvc/ViewModels/RoomsVm.cs
	Bs.Calendar.Mvc/Views/Room/Index.cshtml
	Bs.Calendar.Mvc/Views/Room/List.cshtml
	Bs.Calendar.Mvc/Views/Shared/_Layout.cshtml
	Bs.Calendar.Mvc/Web.config
	Bs.Calendar.Tests.Int/Bs.Calendar.Tests.Int.csproj
	Bs.Calendar.Tests.Int/packages.config
	Bs.Calendar.Tests.Unit/Bs.Calendar.Tests.Unit.csproj
Minor changes
User view update
added FakeBaseRepository, added IContextable, wrote unit test using FakeUserRepository
UserService update
Merge branch 'master' of https://github.com/fomaa/Calendar
Added unit tests, updated user view
Merge branch 'master' of github.com:fomaa/Calendar
removed user.Id in the UserList.cshtml. I guess we don't have to show this info for everybody

minor changes in the Index.cshtml, just trying to work with Gumby
removed try{} catch(){} block in the UsersController.cs class in the Delete method

removed unused namespace using Bs.Calendar.DataAccess.Bases;
some changes in the Edit.cshtml
Removed duplicate code - Edit UsersController.cs in the Controllers (added PassUserIntoTheView(string view, int id)).
Added UnitTests to UserControll, updated user-view
minor changed in the integration tests according to changes in the Repository.
Merge branch 'master' of github.com:fomaa/Calendar
Merge https://github.com/fomaa/Calendar into Paul

Conflicts:
	Bs.Calendar.Mvc/Bs.Calendar.Mvc.csproj
	Bs.Calendar.Mvc/Content/Rooms/ColorPicker.css
	Bs.Calendar.Mvc/Services/RoomService.cs
	Bs.Calendar.Mvc/Views/Room/EditRoom.cshtml
	Bs.Calendar.Mvc/Web.config

Solved, Merged