finish sale
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/apps/merchant/app/sale/logics/_router.coffee