corrigindo data
Merge branch 'dev' of github.com:nucleo-digital/agua-sp into dev
inclusao e configuracao de lib para slideshow na secao a crise
adicionado conteudo aos itens do site
Merge branch 'luiz' into dev

Conflicts:
	_layouts/default.html
	js/main.js