latest changes to support merchant payment
Merge branch 'V2.0.0' of ssh://github.com/getkickbak/KICKBAK into V2.0.0

Conflicts:
	app/views/layouts/business/application.html.erb