Basic OSGi Manifest and core attribute descriptions
Merge local changes with origin/master