merged with master
fixed a bug in serialization logic, and made a system for the map tiles
merged