course multitypes without serch
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/java/net/github/rtc/app/controller/admin/CoursesController.java
	src/main/java/net/github/rtc/app/controller/admin/UserController.java
course multitypes without search
Merge remote-tracking branch 'origin/Develop' into Develop