Add marker to reference location
Merge branch 'master' into features/eugene/reference-location

Conflicts:
	www/js/game/controllers/simulator/simulator.js
	www/js/game/directives/leafletMap/leafletMap.js
Add logic to 'tombstone' marker
Merge pull request #38 from IanMayo/features/eugene/reference-location

Add marker to reference location