Initial commit of merchant app code