Master Productionizing #1
fixing conflicts
adding changes to reports
Merge branch 'master' of https://github.com/aen-tech/atlas_claims into atlas_production