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

Conflicts:
	WebSite/index.html
	WebSite/mapPage.html.orig