clean up position data code
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife
Merge branch 'master' into ari-build_framework

Conflicts:
	js/main.js