Mockups - 1
Merge branch 'dev' of https://github.com/mixitProyecto/mixit into dev