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

Conflicts:
	wscacicneo/templates/report.pt