Updated REST service to match API contract
Merge branch 'master' of https://github.com/SirCAS/MakerLabApp