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

Conflicts:
	.idea/libraries/lib.xml
	SRSurvey/grails-app/views/comment/comment.gsp
	algorithms/src/org/macademia/algs/Test.java
Merge remote-tracking branch 'upstream/people' into people