changed leaflet to 0.6.4
removed previous hacks for leaflet 0.5
temporal fix for Leaflet/Leaflet#2021
Merge branch 'develop' into features/CDB-407
fixed edition on leaflet CDB-407