Working on showing dual-layout of salesHistory.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/apps/merchant/app/account/customerManagement/sections/customSaleDetails.jade