Merge branch 'master' into marty
Fixed crash with Hips when adding hip without a ridge vent.  Modified Generate Estimate JSON for Misc Accessories
Merge branch 'marty'
Merge branch 'master' into marty
Cleaned up alert messages
Merge branch 'marty'
Merge branch 'Dustin'
Merge branch 'master' into Dustin