generic annotator code
Merge remote-tracking branch 'origin/generic_uima'

Conflicts:
	src/edu/cmu/cs/in/hoop/hoops/load/HoopUIMAConfigurationLoadBase.java
generic room annotator project
generic uima code - last updated for final presentation
Quick checkin of some small tweaks so that we can merge with the generic
uima code
Merge remote-tracking branch 'origin/generic_uima'

Conflicts:
	.classpath
	Resources/ExampleProjects/HoopExample3-NameEntityRecognition(Partial)/graph.xml
	Resources/ExampleProjects/HoopExample3-NameEntityRecognition(Partial)/logs/je.log.txt
	Resources/ExampleProjects/HoopExample3-NameEntityRecognition(Partial)/logs/je.log.txt.1
	Resources/ExampleProjects/HoopExample3-NameEntityRecognition(Partial)/logs/je.log.txt.2
	Resources/ExampleProjects/HoopExample3-NameEntityRecognition(Partial)/system/documents/je.info.0
	Resources/ExampleProjects/HoopExample4-NameEntityRecognition(Full)/output-rekey.csv
	Resources/ExampleProjects/HoopExample4-NameEntityRecognition(Full)/output.csv
	Resources/ExampleProjects/HoopExample7-PipelineTest/logs/je.log.txt
	Resources/ExampleProjects/HoopExample7-PipelineTest/system/documents/je.info.0
	Resources/ExampleProjects/HoopUIMAComparison/graph.xml
	Resources/ExampleProjects/HoopUIMAComparison/preview.png
	src/BreadCrumbTest.java
	src/Hoop.java
	src/HoopGUITests.java
	src/com/google/common/util/concurrent/ServiceManager.java
	src/edu/cmu/cs/in/base/HoopLink.java
	src/edu/cmu/cs/in/base/HoopProperties.java
	src/edu/cmu/cs/in/controls/HoopGridNode.java
	src/edu/cmu/cs/in/controls/HoopGridNodeVisualizer.java
	src/edu/cmu/cs/in/controls/HoopHTMLPane.java
	src/edu/cmu/cs/in/controls/base/HoopJDialog.java
	src/edu/cmu/cs/in/controls/base/HoopJFrame.java
	src/edu/cmu/cs/in/controls/dialogs/HoopGenericNameDialog.java
	src/edu/cmu/cs/in/controls/splitpanel/HoopMultiSplitLayout.java
	src/edu/cmu/cs/in/controls/splitpanel/HoopMultiSplitNode.java
	src/edu/cmu/cs/in/hoop/HoopHelp.java
	src/edu/cmu/cs/in/hoop/HoopManager.java
	src/edu/cmu/cs/in/hoop/HoopMultiViewFrame.java
	src/edu/cmu/cs/in/hoop/HoopTabDraggable.java
	src/edu/cmu/cs/in/hoop/HoopTabPane.java
	src/edu/cmu/cs/in/hoop/editor/HoopBasicGraphEditor.java
	src/edu/cmu/cs/in/hoop/editor/HoopEditorMenuBar.java
	src/edu/cmu/cs/in/hoop/editor/HoopNodeRenderer.java
	src/edu/cmu/cs/in/hoop/editor/HoopVisualGraph.java
	src/edu/cmu/cs/in/hoop/execute/HoopExecuteInEditor.java
	src/edu/cmu/cs/in/hoop/hoops/analyze/HoopMatcher.java
	src/edu/cmu/cs/in/hoop/hoops/base/HoopDisplayBase.java
	src/edu/cmu/cs/in/hoop/hoops/save/HoopCSVWriter.java
	src/edu/cmu/cs/in/hoop/hoops/transform/HoopFilterStopWords.java
	src/edu/cmu/cs/in/hoop/properties/HoopInspectablePanel.java
	src/edu/cmu/cs/in/hoop/properties/HoopPropertyPanel.java
	src/edu/cmu/cs/in/hoop/visualizers/HoopCluster.java
	src/edu/cmu/cs/in/network/HoopBroker.java
	src/edu/cmu/cs/in/network/HoopSocketServerBase.java