Map Data
Loading of Data Changes
Merge branch 'master' of https://github.com/madmunky/Bloodwych

Conflicts:
	Map.js
	fileloader.js
Extra Triggers