AP-2049 removed some bloat from merchant demo, made some minor edits to controller to work with updated client library
AP-2049 fix merge conflict