Conflicts: bring to master #4931

	src/com/dotmarketing/cms/comment/action/CommentsAction.java
	src/com/dotmarketing/util/ServletResponseCharacterEncoding.java
	src/com/dotmarketing/velocity/VelocityServlet.java