calendar works updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Controller/SalesordersController.php
Merge remote-tracking branch 'origin/master'

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