Merged master+daily

Also added world map stuff