better annual report loop
Merge branch 'develop-annual-reports' into develop
Merge branch 'develop'