Merge branch 'master' into marty
Merge branch 'master' into marty
Reinstated fix for crash on summary page when not selecting Services, as well as 0ft display for ridges
Merge branch 'marty'
Merge branch 'master' into Dustin