Merge branch 'Fixed-Issue-#7' into 'staging'

Fixed issue #7

See merge request !20

src/server/world/map.js

@@ -87,7 +87,7 @@ define([
 
 			mapFile = require('../config/maps/' + this.name + '/map');
 			this.mapFile = mapFile;
-
+			this.mapFile.properties = this.mapFile.properties || {};
 			mapScale = mapFile.tilesets[0].tileheight;
 
 			this.instanced = mapFile.properties.instanced;