Comments fix
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/scala/servlets/CommentServlet.scala