Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
old version
Merge branch 'master' of https://github.com/bhillman/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/EmailController.groovy
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
adition of the word three and bolded
interest edits
interest validation fixes plus change to three minimum interests