Merge branch 'ting_branch_4' for survey results page
the demo presentation
Merge branch 'master' into ting_branch_4