Fix tests after upgrade to Django 1.6

Conflicts:

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