Adds unforgivable bad FromJSON instance for Map SkillType Skill.
Adds sample world.
Minor changes to accomodate level creation.
Fixes merge issues.