Merge pull request #79 from haavardlian/server

Server
add Icons to each category - Not working properly
merge
Sync now has its own instance of RequestManager
Fixed errors due to new User class
Merge branch 'develop' of github.com:haavardlian/UbiSolar into develop
Diamon array list fix
Dev build for friend request proxy
Set days to default data pulling
Fixed graph crash
Hard-coded newsfeed
Merge branch 'comparison' of https://github.com/haavardlian/UbiSolar into comparison
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into comparison
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