Merge branch 'master' into Dustin
Fixed roof areas and squares on summary, reset vars
Merge branch 'Dustin'