Merge branch 'developer' into enemy

# Conflicts:
#	World.h
#	worlds/world1.json

World.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include "HeightMap.h"
 #include "Player.h"
 #include "Enemy.h"
 
@@ -15,7 +16,11 @@ public:
 
 	Player& player;
 	std::vector<Entity*> entities;
+
 	std::vector<Enemy*> enemies;
+
+	HeightMap* heightmap;
+
 	void draw();
 	void update(float elapsedTime);
 	bool isPlayerPositionValid();