MERGE

update:
1. merchant-upload UI

issue
1. bookmark
/user-bookmark"  Result: Uncaught SyntaxError: Unexpected token catch
in express-layouts.js:75
2. inbox message cannot click
3. merchant payment details wrong