1.5 fixes

Conflicts:
	qgis-app/templates/base.html