afsd
Merge branch 'leon' of https://github.com/askho/Projects into leon

Conflicts:
	JS/main.js
	php/generateJsonMarkers.php