Merged with master to get updates
Refactored Filter methods and Int-tests
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