Fixed Web API to work with new tornado code!
Merge remote-tracking branch 'upstream/dev' into testing