Merge pull request #107 from findsorguk/viewHelperProblems

Fix contexts view helper
Merge pull request #108 from findsorguk/viewHelperProblems

Changed a method name
Merge pull request #109 from findsorguk/viewHelperProblems

View helper problems
Merge pull request #110 from findsorguk/viewHelperProblems

Semi fix to get stuff to work
Merge pull request #111 from findsorguk/viewHelperProblems

Fix involved sidebar
Merge pull request #112 from findsorguk/viewHelperProblems

View helper problems
Fixed layout on front page
Sidebar highlighting now working again
Merge pull request #113 from findsorguk/issue66NewRevisedSiteStructure

Layout fix and sidebar highlighting fix
Changes for people

This should fix #34
Merge pull request #114 from findsorguk/newIssue34

Changes for people
Conflicts fixed