Fixed errors due to new User class
Merge branch 'develop' of github.com:haavardlian/UbiSolar into develop