Made Entity inherit RigidBody for ease of conversion
Merging with master