done button difficulties solved
Merge remote-tracking branch 'origin/macSurvey' into macSurvey

Conflicts:
	Macademia/grails-app/views/vizSurvey/comparisonSurvey.gsp
thankyou.gsp was added