logic ordering to avoid touching session, if necessary
Merge remote branch 'origin/master'
Update readme.markdown
Update readme.markdown
Django 1.3.x compatibility restored
Merge branch 'master' into dev

Conflicts:
	cms/templatetags/cms_tags.py
	readme.markdown