Merge branch 'live-map'
Merge branch 'master' of https://github.com/barriespotter/Web_App