Merge pull request #58 from sourishkrout/master

Fix for the one remaining functional UICatalog test
updates to correspond to JSONWP
Merge pull request #59 from jlipps/master

JSONWP compatibility fixes
sending location through Location header, like http says
Merge pull request #60 from santiycr/master

Location header thingie
up socket client timeout
Merge pull request #61 from jlipps/master

up socket client timeout
Copying over Robot Calibration Code
Moving Robot Calibration App to better location
Merge pull request #62 from penguinho/master

Moving Over Robot Calibration App, first part of Robot Code Port