add missing config for manifest_merchant.js
Merge remote-tracking branch 'origin/master'

* origin/master:
  add missing config for manifest_merchant.js

Conflicts:
	portal/config/environments/production.rb