Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/Cacic/CommonBundle/Resources/config/routing.yml
Merge local
Merge local
Merge branch 'master' of https://github.com/lightbase/cacic
Merge com 3.1 do repositório
Merge com 3.1 do repositório
Corrige atualização de subredes e adiciona debug nas coletas
Merge branch 'master' into 3.1