Fix dwelling serialization and add import feature
Add id to Situation