Fixed bug in list services
Merge branch 'master' into holis_test-2

Conflicts:
	switcher/list_lservices.php