finished editing google map
updates to static pages
numerous changes to sync up content with live version
Merge branch 'develop' into staging