Merge branch 'dev' into design
Correcciones estilo tags.
Merge branch 'design' into dev
Merge branch 'dev' of https://github.com/ciudadanointeligente/vizard into dev