TOuch v2
Merge branch 'master' of https://github.com/iDevy/django-leaflet

Conflicts:
	leaflet/static/leaflet/draw/leaflet.draw.js