Remove duplicate App.Payment model.
Merge branch 'master' into support-wizard-menu

Conflicts:
	static/global/js/app/order.js