Expanded controller testing

Enhanced social map functionality

Made small fixes to routes etc.
Added testing for surveys and fixed problems with how surveys show up in the research section, began to style forum, + other fixes.
Merge branch 'master' into R1.0
Merge pull request #50 from openpprn/R1.0

R1.0