fixed conflict ForumResource
Merge branch 'dev' of github.com:VitoInfinito/codedark into dev

Conflicts:
	src/main/java/cds/ForumResource.java