Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/SalesordersController.php
	app/View/Jobmonitorings/index.ctp
Merge branch 'master' of https://github.com/BSSAM/bs