Merge branch 'master' of github.com:gunnarbeutner/strawberry

diff --cc cib/host.cpp
Simple merge

diff --cc cib/host.h
Simple merge

diff --cc cib/hostgroup.cpp
Simple merge

diff --cc cib/hostgroup.h
Simple merge

diff --cc cib/service.cpp
Simple merge

diff --cc cib/service.h
Simple merge

diff --cc cib/servicegroup.cpp
Simple merge

diff --cc cib/servicegroup.h
Simple merge