-- fix restlet dependency
Merge branch 'dev'

Conflicts:
	osgi/pom.xml