Updated Maps
Merge branch 'master' of https://github.com/clairityproject/trial

Conflicts:
	Javascript3.js
Trey