*
Merge branch 'master' of https://github.com/ZuTa/StudyingController
*db generation
Merge branch 'master' of https://github.com/ZuTa/StudyingController

Conflicts:
	StudyingController/StudyingController.v11.suo
	StudyingController/StudyingController/Service References/SCS/ControllerService44.xsd
	StudyingController/StudyingController/Service References/SCS/Reference.cs
*