temp
temp
Changed the zoom functionality
Fixed merge conflict
Working on fragment state keeping
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop