1.10 new service orders
Merge branch '1.10' into 1.11

Conflicts:
	controllers/sample.php
manually updated 1.11 MixedCase to lowercase originating from 1.10