partial labelFactory

Had to commit so i can pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	TextClassificationSerial.cpp