merged
deleted old fiels
Merge branch 'master' of https://github.com/IliyaTryapitsin/Scheduler

Conflicts:
	Host/Timetable.Data/Timetable.Data.csproj
	Host/Timetable.Data/obj/Debug/TempPE/Resources.Messages.Designer.cs.dll
	Host/Timetable.Logic/Services/SchedulerService.cs
	Host/Timetable.Site/App/controllers/lecturerScheduleController.js.orig
	Host/Timetable.Site/App_Start/BundleConfig.cs
	Host/Timetable.Site/Areas/Dispatcher/Controllers/AuditoriumScheduleController.cs
	Host/Timetable.Site/Areas/Dispatcher/Controllers/FacultyController.cs
	Host/Timetable.Site/Areas/Dispatcher/Controllers/GroupController.cs
	Host/Timetable.Site/Areas/Dispatcher/Controllers/LecturerScheduleController.cs
	Host/Timetable.Site/Areas/Dispatcher/Controllers/SchedulerController.cs
	Host/Timetable.Site/Areas/Dispatcher/Controllers/UserController.cs
	Host/Timetable.Site/Areas/Dispatcher/Models/ResponseModels/GetAuditoriumsAndSchedulesResponse.cs
	Host/Timetable.Site/Areas/Dispatcher/Models/ResponseModels/GetAuditoriumsResponse.cs
	Host/Timetable.Site/Areas/Dispatcher/Models/ResponseModels/GetSchedulesAndInfoesResponse.cs
	Host/Timetable.Site/Areas/Dispatcher/Models/ViewModels/AuditoriumScheduleGeneralViewModel.cs
	Host/Timetable.Site/Areas/Dispatcher/Models/ViewModels/SchedulerViewModel.cs
	Host/Timetable.Site/Areas/Dispatcher/Scripts/App/controllers/lecturerScheduleController.js
	Host/Timetable.Site/Areas/Students/Controllers/AuditoriumScheduleController.cs
	Host/Timetable.Site/Areas/Students/Models/ViewModels/AuditoriumScheduleViewModel.cs
	Host/Timetable.Site/Areas/Students/Views/AuditoriumSchedule/_Index.cshtml
	Host/Timetable.Site/Areas/Students/Views/ThreadSchedule/_Index.cshtml
	Host/Timetable.Site/Timetable.Site.csproj