Google Map
Map Update
Changes
Fix Attribution
Merge branch 'Map-Edits'

Conflicts:
	js/Javascript3.js
	wireframe2.html
Merge branch 'master' of https://github.com/clairityproject/frontend