Work done on the Estimates Price print
Merge branch 'master' of github.com:robertrico/Estimator

Conflicts:
	View/Estimators/index.ctp
	View/Pricematches/printreceipt.ctp