blah
Merge branch 'master' of github.com:braingineer/COREF

Conflicts:
	rnlp/bin/nohup.out

	modified:   bin/edu/rutgers/nlp/rubric/agents/collabref/CollabRefIntentionGenerator.class
	modified:   bin/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet$1.class
	modified:   bin/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet$BladeRunnerThread.class
	modified:   bin/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet$WaitForUserThread.class
	modified:   bin/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet.class
	modified:   rnlp/bin/nohup.out
	modified:   rnlp/src/edu/rutgers/nlp/asciispec/test/blocks/BlocksConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/asciispec/test/blocks/actions/BlocksActionSource.java
	modified:   rnlp/src/edu/rutgers/nlp/asciispec/test/blocks/actions/InitializeTwoBlocks.java
	modified:   rnlp/src/edu/rutgers/nlp/asciispec/test/blocks/actions/Move.java
	modified:   rnlp/src/edu/rutgers/nlp/asciispec/test/blocks/tasks/RestackTwoBlocks.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/db/DatabaseConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/db/DatabaseSemantics.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/figure/FigureConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/figure/FigureSemantics.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/math/SetTheoryConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/math/SetTheorySemantics.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/QuestionsConcepts.java
modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/QuestionsSemantics.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/taskactions/QuestionsActionConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/taskactions/QuestionsActionSource.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/taskactions/askWhichQ.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/taskactions/askYNQ.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/taskactions/command.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/taskactions/pushWhichQ.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/questions/taskactions/pushYNQ.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/salience/SalienceConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/salience/SalienceSemantics.java
	modified:   rnlp/src/edu/rutgers/nlp/resources/namespaces/tabulatedfacts/TabulatedFactsConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/CollabRefIntentionGenerator.class
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/CollabRefIntentionGenerator.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/CollabRefConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/CollabRefSemantics.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/CollabRefActionConcepts.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/CollabRefActionSource.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/abandonTasks.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/addToScene.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/addcr.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/continueTask.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/flagProblematic.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/negcr.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/nop.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/past.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/pushClarify.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/pushCollabRef.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/pushMA.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/pushRemind.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/refuseTaskAction.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/setPrag.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/setVarValue.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/skip.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/tacitAbandonTasks.java
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/resources/taskactions/tacitNop.java
	new file:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Applet$2$1.class
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet$1.class
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet$BladeRunnerThread.class
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet$WaitForUserThread.class
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet.class
	modified:   rnlp/src/edu/rutgers/nlp/rubric/agents/collabref/studies/exemption1/Exemption1Servlet.java
	modified:   rnlp/studies/exemption1/code/Exemption1Applet.jar
	new file:   rnlp/studies/exemption1/data/ha20070213/WithModel/StartApplet.txt
	new file:   rnlp/studies/exemption1/data/ha20070213/WithModel/WithModel1_Agent.game
	new file:   rnlp/studies/exemption1/data/ha20070213/WithModel/WithModel1_Agent.log
	new file:   rnlp/studies/exemption1/data/ha20070213/WithModel/http_requests.txt
	new file:   rnlp/studies/exemption1/data/ha20070213/WithModel/http_server.err.txt
	new file:   rnlp/studies/exemption1/data/ha20070213/WithModel/http_server.out.txt
	new file:   rnlp/studies/exemption1/data/ha20070213/WithModel/nextSIDNum.txt
	deleted:    rnlp/studies/exemption1/data/policyIterFour-betterInvariate/statistics/.decisions.successCOREFOnly.swp
	deleted:    rnlp/studies/exemption1/data/policyIterFour-betterInvariate/statistics/.decisions.successHumanOnly.swp
	modified:   setup_linux