Merge branch 'developer' into enemy

# Conflicts:
#	CrystalPoint.cpp
#	Entity.cpp
#	Player.cpp
#	Player.h
#	World.cpp
#	World.h

Entity.cpp

@@ -21,7 +21,6 @@ Entity::~Entity()
 
 void Entity::draw()
 {
-	//rotation.y += 0.05f;
 	if (model)
 	{
 		glPushMatrix();
@@ -31,7 +30,6 @@ void Entity::draw()
 		glRotatef(rotation.y, 0, 1, 0);
 		glRotatef(rotation.z, 0, 0, 1);
 		glScalef(scale, scale, scale);
-		//glTranslatef(-model->center.x, 0, -model->center.z);
 
 		glEnable(GL_CULL_FACE);
 		glCullFace(GL_BACK);