Update layout
Merge branch 'master' of github.com:/danilovaz/portal-genexus

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/main.css
	app/views/layouts/application.html.erb
oficial change
Merge branch 'master' of github.com:/danilovaz/portal-genexus

Conflicts:
	app/assets/stylesheets/main.css
	app/views/layouts/application.html.erb
Alteracoes