Fix delta config
Display cluster of markers on map
Add option to select map type + refactoring
Merge branch 'cluster'

Conflicts:
	stumbler.zip
mozMobileConnection API changes in 1.3