temp merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manualAnnotations.csv
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added manualAnnotations.csv and FeatureGeneratorDefaultPlusOne.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	manualAnnotations.csv
Merge pull request #13 from bobgian/development

Development