Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' of github.com:ciudadanointeligente/vizard
Merge branch 'dev'
Merge branch 'dev'
change title margin and hover color closes #128 closes #129
Merge branch 'test_joaquin' into dev