Refs #2: Display proposal result status in proposal admin change lists
Merge branch 'develop' of github.com:caktus/pycon into develop

Conflicts:
	symposion/proposals/models.py