Fixed a bug that could cause an NPE exception.
Merge branch 'master' into devel
Fixed a bug that could cause an NPE exception.
Merge branch 'master' into devel

Conflicts:
	src/main/java/org/jboss/pressgang/ccms/utils/common/FileUtilities.java
Fixed XMLUtilities.convertStringToDocument(), so that the default error handler which prints to stderr isn't used.
Merge branch 'master' into devel