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

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
	SRSurvey/test/integration/srsurvey/ExperimentalGroupIntegrationTests.groovy
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
small size change
small size change
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr
small size change
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
reload of rating page
Linking different pages together
Merged with Jesse's changes
Added the email controller
Added the email controller
working on email controller
Merge branch 'master' of https://github.com/bhillman/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
Pulled from Ken