Merge branch 'master' into design
Merge branch 'design'
Merge branch 'master' of https://github.com/ciudadanointeligente/vizard