Changed the ATOM feed to display a diff, since the HTML field was removed.
Merge commit '99dee28c2a6bfd06efe695137802b8a9a7139077' into ha-devel-1.1

Conflicts:
	src/main/java/org/jboss/pressgang/ccms/server/rest/v1/base/BaseRESTv1.java