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

Conflicts:
	SRSurvey/grails-app/views/mockup/comments.gsp
invite files
quick update to ratingcontroller
Updated the interest controller for testing. Removed the survey unique identifier in the person domain class because it appeared to be causing issues.