Merge branch 'master' of https://github.com/bhillman/context-sensitive-sr
Updated ratings controller to support SRService and some integration tests
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
Working on storing user inputs from ratings page
Merge pull request #14 from keeeeenw/master

Commits on Thursday
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
Merge branch 'master' of git://github.com/shilad/context-sensitive-sr
Consent links to Interest