linde returns support
Merge branch 'master' into linde_returns

Conflicts:
	linde_app2/urls.py
fixup for base.html