_ ajustes gerais
Merge branch 'master' of https://github.com/samuelmolinski/GrupoDeMidia

Conflicts:
	less/style.less
_mudanças e ajustes no layout
_ajustes
Merge branch 'master' of https://github.com/samuelmolinski/GrupoDeMidia

Conflicts:
	epanel/page_templates/page_templates.css
	less/style.less