start implementation
fix mege conflict
add entity implementations
 merge skrogh zds
finish implementation game
mere impl.
Merge remote-tracking branch 'upstream/zds' into zds
mere impl.