ייי
Merge branch 'master' of https://github.com/omerlive/Mobile

Conflicts:
	WebSite/mapPage.html