Fix to delete survey
Merge branch 'master'

Conflicts:
	app/js/pages/SurveyPage.coffee
Surveys working