Edit and remove categories of courses.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Studie/src/main/java/ua/dp/stud/studie/controller/CoursesController.java
	Studie/src/main/webapp/WEB-INF/views/viewAllCourses.jsp
	stud_theme/src/main/webapp/css/custom.css
Merge remote-tracking branch 'origin/develop' into develop