Merge pull request #80 from haavardlian/comparison

Comparison
Add different icon on each category
some cleanup
Changed weeks
possible error
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop
Changes to database query
Merged
fixes
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop
Fixed profile residence height
Rating now works if you are logged into facebook
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into comparison

Conflicts:
	android/UbiSolar/UbiSolar/src/main/res/layout/fragment_profile.xml