After merge with static-pages
Merge branch 'master' into static-pages

Conflicts:
	app/views/layouts/application.html.erb
	config/routes.rb
Correção das cagadas de merge