Functional map layers and popups
Merge new API changes
Merge branch 'develop' of github.com:klpdotorg/dubdubdub into develop