Test unfinished
Interface changes
Interface changes
Merge remote-tracking branch 'origin/master3' into master2

Conflicts:
	prueba.log
	saves/classifier/example1.xml