Merge branch 'theme_options'

Conflicts:
	page-home.php
Merge branch 'jony_dev'
implementando link nos 4 boxes de options e chamando o shortcode do slide plugin Pointelle Slider no page-home.php
adaptando o css para as classes geradas dinamicamente para as categorias filhas
Merge branch 'master' into css_diego

Conflicts:
	page-home.php