Updated osgi
Merge branch 'master' of https://github.com/nablex/resources-api