Merge branch 'progress-report-dev'
Merge branch 'master' of https://github.com/Advanced-Roofing-Inc/advanced-apps