category and merchant import
Merge branch 'master' of https://github.com/rrkd/hellscream

* 'master' of https://github.com/rrkd/hellscream:
  update userprofile page
  update merchant detail page
  update merchant detail page
  update quotelist and quotemessage
  update merchant profile
suburb import