refs #593 - merge rpc rest/angular demo