Kam

Merge current REST work into master
Same comment about version management