Abort transactions before showing errors
Abort transactions before showing errors

Conflicts:

	mapentity/static/mapentity/Leaflet.label
	mapentity/views/generic.py

makinacorpus/django-mapentity,makinacorpus/django-mapentity,Anaethelion/django-mapentity,makinacorpus/django-mapentity,Anaethelion/django-mapentity,Anaethelion/django-mapentity