raw html slider
Merge remote-tracking branch 'origin/master'

Conflicts:
	archive/2013/index.html
	archive/index.html
	assets/js/tipuesearch_content.json
	blog/conveniotjrjnamd.html
	blog/emapmprj.html
	blog/iguarapenamd.html
	blog/index.html
	colaboracoes.html
	cooperacao.html
	faleconosco.html
	galleries/demo/index.html
	galleries/demo/rss.xml
	galleries/index.html
	galleries/rss.xml
	historico.html
	index.html
	infraestrutura.html
	pesquisa.html
	projetos.html
	publicacoes.html
	quemsomos.html
	rss.xml
	site/conf.py
	site/pages/index.rst
	sitemap.xml
	tags/consumidor.html
	tags/consumidor.xml
	tags/dados-abertos.html
	tags/emap.html
	tags/emap.xml
	tags/iguarape.html
	tags/index.html
	tags/mp-rj.html
	tags/mp-rj.xml
	tags/namd.html
	tags/namd.xml
	tags/tj-rj.html
	videos.html