updated for karaf 2.3.1
Merge branch 'master' of https://github.com/JohannesKlug/hbird

Conflicts:
	src/osgi/osgi-provisioning/src/main/resources/features.xml