1.5 migration

Conflicts:
	plugins/templates/plugins/plugin_base.html
	plugins/templates/plugins/plugin_detail.html
	qgis-app/settings.py
	qgis-app/templates/admin/flatpages/flatpage/change_form.html
	qgis-app/templates/admin_copies/change_form.html
	qgis-app/templates/base.html
	qgis-app/templates/cab/snippet_detail.html
	qgis-app/templates/flatpages/homepage.html
	qgis-app/templates/taggit_templatetags/tagcloud_include.html
	qgis-app/users/templates/user_base.html
	qgis-app/users/urls.py