Moved XML resources to proper resource location according to Maven
convention
Merge branch 'master' into localmod
Updated main pom.ml with Git info