Merge remote-tracking branch 'origin/master'

Conflicts:
	views/sale/get.ejs
Merge remote-tracking branch 'origin/master'