added ability to edit vendors
bug fixes
fixed merge conflict in routes