Merge branch 'flo_working'
Merge branch 'flo_working'
shmField angelegt
Merge branch 'master' into isa_working

Conflicts:
	service.c
Merge branch 'master' into isa_working