Metido travis bien
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/develop' into develop
change the isPropia()