Merge branch 'master' into Dustin
roof area validation for drop down on second round fix
Merge branch 'Dustin'
Merge branch 'master' into marty