Upgrade components to Django 1.6

Conflicts:

	mapentity/static/mapentity/Leaflet.label
	setup.py