Estilo sidebar
Merge branch 'master' into design

Conflicts:
	app/views/sandboxes/show.html.erb
Merge branch 'master' into design
Merge branch 'design'
Merge branch 'master' of https://github.com/ciudadanointeligente/vizard