Real Locations
Merge branch 'master' of https://github.com/clairityproject/frontend

Conflicts:
	createGraphs3.html