Adapters cleaned up
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop