import merchant service
import merchant service
category and merchant import
Merge remote-tracking branch 'origin/master'

* origin/master:
  update merchant page
  update create merchant page
  update footer and home page
  home page
  contact us changes