Fix class name refactoring

Rename Entity to ClientEntity in client (jube's bug)
Merge branch 'develop' of https://github.com/DeadPixelsSociety/Gzzzt into develop