no changes were made here...
Merge remote-tracking branch 'origin/master'

Conflicts:
	lipreading-core/src/main/java/edu/lipreading/TrainingSet.java