Updated prizemail to AGDQ2014 (need to make it database-read instead eventually)
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2
Merge branch 'master' of github.com:uraniumanchor/sda-donation-tracker-2
Fallback fix for Bid annotations when the amount is not already set
Merge remote fixes into prizemail

Conflicts:
	prizemail.py
	viewutil.py