Merge branch 'master' of https://github.com/bhillman/context-sensitive-sr
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
email links to consent
Merge branch 'master' of https://github.com/bhillman/context-sensitive-sr
email links to consent
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
Merge branch 'master' of git://github.com/shilad/context-sensitive-sr
invite files
quick update to ratingcontroller
Commit for merge
interesting
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/RatingController.groovy
Merged changes from RatingController to work with specific key
Merged changes from RatingController to work with specific key
Merge Changes from Jesse
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/RatingController.groovy
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
Updated the interest controller for testing. Removed the survey unique identifier in the person domain class because it appeared to be causing issues.
Updated the interest controller for testing. Removed the survey unique identifier in the person domain class because it appeared to be causing issues.