add mysql2
Merge branch 'master' of https://github.com/ciudadanointeligente/vizard
Merge branch 'master' of https://github.com/ciudadanointeligente/vizard
Merge branch 'design'
Fixed step text size bug
Merge branch 'master' of github.com:ciudadanointeligente/vizard
hidde and display
Merge branch 'master' of https://github.com/ciudadanointeligente/vizard
display and hidde sidebars
Estilo sidebar
Merge branch 'master' into design

Conflicts:
	app/views/sandboxes/show.html.erb