Merge branch 'master' into ngrams

Conflicts:
	src/com/beinformed/research/labs/dialogprogress/testing/DataGenerator.java
	src/com/beinformed/research/labs/dialogprogress/testing/DataReader.java
	src/com/beinformed/research/labs/dialogprogress/testing/Error.java
	src/com/beinformed/research/labs/dialogprogress/testing/PredictorTester.java
	src/com/beinformed/research/labs/dialogprogress/testing/ResultWriter.java
	src/com/beinformed/research/labs/dialogprogress/testing/TestResult.java
fixed ngrams