Removed merge thrash
Modified restlet dependencies
Fixed jaxbNameSpacePrefixMapper dependency declaration