fix for points sum in newsfeed
Merge remote-tracking branch 'origin/master'
SSO_URI in template now is now taken from local_settings
Merge branch 'master' of https://github.com/martflu/amanaman into comment_pagination