chuyen sang lemon (con kiem kho voi tra hang, thong bao)
Merge remote-tracking branch 'origin/master'

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