Merge origin/master

Conflicts:
	app/View/Layouts/default.ctp
	app/View/Plugin/Conteudos/Conteudos/paginas_home.ctp
	app/webroot/css/bra.css