reject
Merge branch 'master' of https://github.com/lightbase/WSCacicNeo
rejec
Merge branch 'master' of https://github.com/lightbase/WSCacicNeo
reject
Conflicts:
	wscacicneo/config/routing.py
	wscacicneo/views/orgaos.py
	wscacicneo/views/relatorios.py
Merge branch 'master' of https://github.com/lightbase/WSCacicNeo
rejec

Conflicts:
	wscacicneo/views/relatorios.py
Merge branch 'master' of https://github.com/lightbase/WSCacicNeo
correção views/coleta