Apache Karaf specific files
Merge branch 'master' of https://github.com/dcm4che/dcm4che.git

Conflicts:
	dcm4che-karaf/pom.xml