changed way surveys are counted for rankings
Merge branch 'dev'