Updating migrations for Django 1.5 compatibility
Adding updates
Merge remote-tracking branch 'upstream/master'
Fixing manager bug
Fixing username reference
Fixing username in feeds
Fixing author username defs
Fixing feed author bug
Revert "Fixing manager bug"

This reverts commit 79a9f143866f473068af68fccc59a3978c705460.
Revert "Updating migrations for Django 1.5 compatibility"

This reverts commit 36a9d1cd4708264f9d0bf384ed75bb57617edda7.
Merge branch 'ItsNotWorking-master' into feature/better-custom-user-support

Conflicts:
	zinnia/admin/entry.py
	zinnia/feeds.py
Pep8 after merge
Merge branch 'feature/better-custom-user-support' into develop