Merge with latest updates from EHJ-52n:develop

* Some license management stuff
* Fixes 52North/sos-importer#6