antes
sin conflictos
uuid, error
cruddb
configuracion global y local add
Merge branch 'master' of https://github.com/agustincl/zgz2014m
login layout
Merge branch 'master' of https://github.com/agustincl/zgz2014m
timeline
Merge pull request #17 from javier747/master

timeline
Merge pull request #18 from paznar/master

pequeños fix de login y home
little fix
fix merge