fix error
Merge branch 'master' of https://github.com/lusiaskolonie/servicecaller

Conflicts:
	src/Serviceapp/Serviceapp/CoreOperation.class.php