commit
Merge branch 'master' of https://github.com/Morlack/EveGisWeb

Conflicts:
	ArcGIS.html