smatch v 0.0-4
Merge branch 'test'

Conflicts:
	Cv/QT/pruebaclases/Smatch/smatch.cpp
gpark noche v 1.0-0