Merge pull request #1 from jrussel1/master

Interest and rating
testing
whatever
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
whatever
commit
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/views/mockup/comments.gsp
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/views/mockup/comments.gsp
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr