temp
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop
Fixed usage tab bug
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop
Cleaned up code
Merge branch 'develop' into us67-social-tab