Remove 3rd coord in JS WKT serializer

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Fix filterform None if get_queryset not called (fixes #847)

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Abort transactions before showing errors

Conflicts:

	mapentity/static/mapentity/Leaflet.label
	mapentity/views/generic.py
Login before accessing JSON list

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Use description attribute if available for GPX serialization

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Add nice default configuration for TinyMCE

Conflicts:

	mapentity/__init__.py
	mapentity/static/mapentity/Leaflet.label
Increase multiple selects height

Conflicts:

	mapentity/static/mapentity/Leaflet.label
	mapentity/static/mapentity/style.css
Fix form tabs apparence for 1024px screens (ref #744, #902)

Conflicts:

	mapentity/static/mapentity/Leaflet.label
	mapentity/templates/mapentity/base.html
Remove trailing spaces

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Reduce list left menu for 1024px screens (ref #744, #902)

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Hide delete from add form in many-to-many

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Store form helper at instance level (ref #712, #879)

Conflicts:

	mapentity/forms.py
	mapentity/static/mapentity/Leaflet.label
Show modify button as disabled in detail page

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Fix overlap between map controls and label (fixes #883)

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Reduce labels width in forms

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Fix table lines height

Conflicts:

	mapentity/static/mapentity/Leaflet.label
Upgrade components to Django 1.6

Conflicts:

	mapentity/static/mapentity/Leaflet.label
	setup.py
Fix tests after upgrade to Django 1.6

Conflicts:

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