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
Updated to version 1.2-SNAPSHOT
Merge branch 'hotfix' into ha-devel

Conflicts:
	pom.xml
Merge branch 'master' into ha-devel
Fixed an issue that was causing compilation failures.
Fixed a bug where the wrong revision number was being used for related TranslatedTopics.
Added a way to get the topics used in a content spec.
Added the "allChildren" collection to content specs.
Fixed BZ#1011259 - Adding a tag doesn't increase the Last Modified Date
Added a custom JacksonJsonProvider, so that it won't fail to deserialize on unknown properties. Updated the version of RESTEasy used from 2.3.2.Final to 2.3.5.Final to fix an issue with the JacksonSerialiser.
Fixed BZ#1011671 "java.lang.NoClassDefFoundError: org/hibernate/search/Search" when performing topic search.
Fixed Interceptors and Request mappers to return the correct version and to only work on the v1 endpoints.
Initial work on BZ#968925 - Provide a mechanism to add additional revision history entries for translations.
Fixed some issues with the recent changes to the exception mappers.
Fix to ensure bad regex patterns can't be saved for property tags.
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