new application layout
Dried up the navbar, closes #172
Merge branch 'dev' into test_joaquin

Conflicts:
	app/assets/javascripts/bpmn.js
	app/assets/stylesheets/style.css.scss
	app/views/sandboxes/show.html.erb
new toolbar
Merge pull request #173 from ciudadanointeligente/test_joaquin

Test joaquin