update order and click
Merge remote-tracking branch 'origin/feature-multi-identity' into feature-multi-identity

Conflicts:
	app/comps/user/drtv-identity-modal.js