leafletjs support
Merge branch 'leaf'