Task #936
task #936
Merge
Merge
Merge
Merge
Task #936
Merge
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Studie/data/test.db.properties
	Studie/src/main/java/ua/dp/stud/studie/controller/CoursesController.java
	Studie/src/main/java/ua/dp/stud/studie/dao/impl/CourseDaoImpl.java
	Studie/src/main/java/ua/dp/stud/studie/model/Course.java
	Studie/src/main/java/ua/dp/stud/studie/model/KindOfCourse.java