Fix formatting issues + Update version numbers and hibernate-core workaround for dom4j