Merge branch 'theme_options' into css_diego

Conflicts:
	page-home.php
Merge branch 'jony_dev' into css_diego
Merge branch 'master' into css_diego

Conflicts:
	page-home.php
resolvendo divs de imagens no header e começando a sidebar