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
little fix
fix merge
objects, adapters, mapptes merged
Merge branch 'master' of https://github.com/paznar/zgz2014m
txt adapter, mysql adapter, hydrate, users mapper
Merge