Re-structured map loading to dramatically decrease load time and added better animations
Fixed merge conflicts and compatibility bugs