Update to shinken 2.0.3-3
Merge remote-tracking branch 'origin/kaji' into kaji

Conflicts:
	debian/control
Merge branch 'kaji' of github.com:kaji-project/kaji into kaji