Merge branch 'devel' into ha-devel

Conflicts:
	pom.xml
	src/main/java/org/jboss/pressgang/ccms/server/rest/v1/RESTv1.java
	src/main/java/org/jboss/pressgang/ccms/server/rest/v1/base/BaseRESTv1.java
Merged devel
Added some comments
Merge branch 'ha-devel' of github.com:pressgang-ccms/PressGangCCMSREST into ha-devel

Conflicts:
	src/main/java/org/jboss/pressgang/ccms/server/rest/v1/RESTv1.java
	src/main/java/org/jboss/pressgang/ccms/server/rest/v1/base/BaseRESTv1.java
Merge branch 'ha-devel' of github.com:pressgang-ccms/PressGangCCMSREST into ha-devel
Added settings to aggregate JavaMelody rrd files
Added settings to aggregate JavaMelody rrd files