Kam

Merge current REST work into master
Versions should only be in the parent pom