FB5061: Must filter out custom offerings as there's no way in dasein to handle this at the moment
FB5061: Must filter out custom offerings as there's no way in dasein to handle this at the moment
Fixing weird java errors
Fixing merge conflicts
Sanitise endpoint URL to avoid possible disappointment
Merge pull request #90 from maksimov/develop

Develop
Merge remote-tracking branch 'upstream/develop' into develop