updated couch design documents, package.json & cofig
stock reports --in working
fixed merge conflicts in package.json