Merge branch 'developer' into johan

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

Vector.h

@@ -12,7 +12,7 @@ public:
 		float v[3];
 	};
 	Vec3f();
-	Vec3f(Vec3f &other);
+	Vec3f(const Vec3f &other);
 	Vec3f(float x, float y, float z);
 	float Length();
 	float Distance(const Vec3f &);
@@ -36,7 +36,7 @@ public:
 	};
 	Vec2f();
 	Vec2f(float x, float y);
-	Vec2f(Vec2f &other);
+	Vec2f(const Vec2f &other);
 	float& operator [](int);
 	Vec2f operator + (const Vec2f &other);
 	float length();