OSGi bundles improved
Merge branch 'master' of https://github.com/Aquil0n/coffee-maker