Fixed some help texts
Merge branch 'master' into public

Conflicts:
	src/ted-to-libsvm.cc