#123, #117
#117
#117
Merge branch 'master' of https://github.com/getsmap/smap-mobile

Conflicts:
	dist/lib/leaflet.draw/dist/leaflet.draw.js