switch back to cdawson map tiles
Merge branch 'master' into new_frontend_design_july

Lots of new features, this is the progress from July to December