Fix order
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/templates/sales/sales.coffee
	client/templates/sales/sales.jade
	lib/models/order.coffee