Merge branch 'master' of https://github.com/lightbase/cacic

Conflicts:
	src/Cacic/CommonBundle/Resources/config/routing.yml
Merge remote branch 'origin/3.1'
merge
Merge branch '3.1' of https://github.com/lightbase/cacic into 3.1
Corrige erros na consultas e colocar valores padrão para o formulário de patrimônio
Merge branch 'master' into 3.1