minor
Merge branch 'dev' of github.com:VitoInfinito/codedark into dev

Conflicts:
	src/main/java/cds/core/Course.java
	src/main/webapp/forum/app/js/controllers.js