Entity location should be a Room

[Scion Altera]

The fact that Entity has coordinates for a location is a holdover from earlier data models that didn't have first class Room objects. In the current model it would make more sense for Entity to be located in a Room and Room to be the only one to have coordinates.