wip
Merge branch 'master' of https://github.com/evandor/skysail-common.git

Conflicts:
	skysail.common.ext.osgimonitor/src/main/java/de/twenty11/skysail/common/ext/osgimonitor/BundleDescriptor.java