github stuff
paquetes que faltaban
Merge branch 'develop' into feature/travis