Added UserModel and Residence
Merge branch 'develop' of github.com:haavardlian/UbiSolar into develop