Commented survey code refs #24
Merge branch 'SurveyController' into Development