reports
reject
Merge branch 'master' of https://github.com/lightbase/WSCacicNeo
reject

Conflicts:
	wscacicneo/config/routing.py
	wscacicneo/static/Chart.js
	wscacicneo/templates/blankmaster.pt
	wscacicneo/views/relatorios.py