Button
Button
Button
Merge remote-tracking branch 'origin/master'
Button
files?
Merge branch 'master' of https://github.com/shilad/context-sensitive-sr
Won't merge.
Merge branch 'master' of https://github.com/shilad/context-sensitive-sr
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
Merge branch 'master' of https://github.com/keeeeenw/context-sensitive-sr
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/views/mockup/comments.gsp
	SRSurvey/grails-app/views/mockup/interest.gsp
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr
Version control fix
Updated to current branch
Merge branch 'master' of https://github.com/MargaretEG/context-sensitive-sr
Updated to current branch
Merge branch 'master' of https://github.com/jrussel1/context-sensitive-sr

Conflicts:
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
Merge branch 'master' of https://github.com/shilad/context-sensitive-sr

Conflicts:
	SRSurvey/application.properties
	SRSurvey/grails-app/controllers/srsurvey/CommentController.groovy
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
	SRSurvey/grails-app/controllers/srsurvey/MockupController.groovy
	SRSurvey/grails-app/controllers/srsurvey/RatingController.groovy
	SRSurvey/grails-app/domain/srsurvey/Person.groovy
	SRSurvey/grails-app/services/srsurvey/PersonService.groovy
	SRSurvey/grails-app/services/srsurvey/SRService.groovy
	SRSurvey/grails-app/views/comment/comment.gsp
	SRSurvey/grails-app/views/comment/final.gsp
	SRSurvey/grails-app/views/interest/consent.gsp
	SRSurvey/grails-app/views/interest/interest.gsp
	SRSurvey/grails-app/views/mockup/comments.gsp
	SRSurvey/grails-app/views/mockup/ratings.gsp
	SRSurvey/grails-app/views/rating/ratings.gsp
	SRSurvey/scripts/invite.sh
	SRSurvey/test/integration/srsurvey/ExperimentalGroupIntegrationTests.groovy
	SRSurvey/web-app/css/survey.css
Merge branch 'master' of https://github.com/shilad/context-sensitive-sr

Conflicts:
	SRSurvey/application.properties
	SRSurvey/grails-app/controllers/srsurvey/CommentController.groovy
	SRSurvey/grails-app/controllers/srsurvey/InterestController.groovy
	SRSurvey/grails-app/controllers/srsurvey/MockupController.groovy
	SRSurvey/grails-app/controllers/srsurvey/RatingController.groovy
	SRSurvey/grails-app/domain/srsurvey/Person.groovy
	SRSurvey/grails-app/services/srsurvey/PersonService.groovy
	SRSurvey/grails-app/services/srsurvey/SRService.groovy
	SRSurvey/grails-app/views/comment/comment.gsp
	SRSurvey/grails-app/views/comment/final.gsp
	SRSurvey/grails-app/views/interest/consent.gsp
	SRSurvey/grails-app/views/interest/interest.gsp
	SRSurvey/grails-app/views/mockup/comments.gsp
	SRSurvey/grails-app/views/mockup/ratings.gsp
	SRSurvey/grails-app/views/rating/ratings.gsp
	SRSurvey/scripts/invite.sh
	SRSurvey/test/integration/srsurvey/ExperimentalGroupIntegrationTests.groovy
	SRSurvey/web-app/css/survey.css