removed unecessary html file
Getting location in the model
merge and update the location
Aesthetic changes to map view
Merge branch 'master' of https://github.com/arikalfus/OperationNightlife

Conflicts:
	index.html
Merge branch 'master' into ari-build_framework

Conflicts:
	index.html
	js/main.js