cancel current order
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/partials/lineItemGridView.html
cancel current order