Lay groundwork for ballot check-ins
Merge branch 'master' into ballot-checkin
Add institution abbreviations (shorter than code, used in edit adjudicators screen)
Add institution conflicts (so individual team conflict don't have to be entered)
Fix conflict highlighting bug
Change edit adjudicator conflict CSS classes
Add data/vic2012/change_adjudicator_conflicts.py
Merge branch 'model-adds' into ballot-checkin
raise RuntimeError not NoneType
Correct rank numbers so that it displays equal ranks correctly
Merge branch 'model-adds' into ballot-checkin
Minor cosmetic changes
Don't allow draws
Upgrade Django to 1.6.1
Follow best practice for form message
Don't allow non-integers or non-multiples of 0.5 as scores
Tidy up code from last commit
Don't allow the third speaker to be the reply speaker
Minor cosmetic
Start work on ballot checkin