Fixed merge error
fixed map dragging issue
Merge branch 'master' of github.com:dma-dk/EPD into dragTest
Merged updates