Fix tpv
Merge branch 'master' of github.com:arcnexus/maya

Conflicts:
	configuracion.cpp