Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into comparison
XML-fixes, translated strings to norwegian
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into comparison

Conflicts:
	android/UbiSolar/UbiSolar/src/main/res/layout/fragment_profile.xml
Merge pull request #81 from haavardlian/comparison

Comparison