changes on Customer and delivery and job monitoring Correction

changes on Customer and delivery and job monitoring Correction
Merge branch 'master' of https://github.com/BSSAM/bs

Conflicts:
	app/Controller/SalesordersController.php
	app/View/Jobmonitorings/index.ctp