Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
Merge branch 'master' of git://github.com/shilad/context-sensitive-sr
Commit for merge
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.
Consent links to Interest
updated survey.css file no longer mybutton in comment and consent gsp files
Fixing the ratings page
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
Fixing the ratings page, deleted some internal css
interestController merged with Jesse's interest/consent and interest/interest updated
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
Deleted the unique property of survey in Person domain class
Merged with Ben
Merged Changes From Margret
The RatingController is fixed
Fixed a bug in SRService
Test
Merge branch 'master' of https://github.com/bhillman/context-sensitive-sr

Conflicts:
	SRSurvey/test/integration/srsurvey/ExperimentalGroupIntegrationTests.groovy
Merged Changes From Margret
The RatingController is fixed
Fixed a bug in SRService
Merge branch 'master' of https://github.com/bhillman/context-sensitive-sr

Conflicts:
	SRSurvey/test/integration/srsurvey/ExperimentalGroupIntegrationTests.groovy
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