ADD: Loading of map with state
Fixed merge conflicts - Added code to save and load map with state