statistics
Merge remote-tracking branch 'origin/master'

Conflicts:
	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)/logs/je.log.txt
	Resources/ExampleProjects/HoopExample4-NameEntityRecognition(Full)/preview.png
	Resources/ExampleProjects/HoopExample4-NameEntityRecognition(Full)/system/documents/je.info.0
	Resources/ExampleProjects/HoopExample7-PipelineTest/logs/je.log.txt
	Resources/ExampleProjects/HoopExample7-PipelineTest/system/documents/je.info.0
	src/edu/cmu/cs/in/base/HoopLink.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/HoopNodePanel.java
	src/edu/cmu/cs/in/hoop/hoops/base/HoopBase.java
	src/edu/cmu/cs/in/hoop/hoops/transform/HoopText2Sentence.java
scatter plot updated