templatetag optimisation to avoid accessing cookies if poss
urls aren't necessarily ascii...
merge
dummy-render moved to admin.py
Merge branch 'mahi'
Fixed error in admin save method
Merge branch 'mahi'