pullin
Merge remote-tracking branch 'origin/macSurvey' into macSurvey

Conflicts:
	Macademia/grails-app/views/d3/comparisonSurvey.gsp
shilad helped us with adding/removing people
Merge remote-tracking branch 'origin/macSurvey' into macSurvey