Changes to the engine (KPK)
Resolved some conflicts
Merged changed code with game engine