public void addEntity(Entity entity, Location location)// throws LocationAddEntityException
	{
		//location.addEntity(entity);
		if(location!=null)
			entityAddQueue.add(new Pair<Entity,Location>(entity,location));
		else
			entityAddQueue.add(new Pair<Entity,Location>(entity,currentLocation));
			 
	}