update version string
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'
Merge tag 'v1.0.6'

v1.0.6 - added version string
version string
merge