Putting two award forms on a diet
Reenabling production after merging @amstars changes
Merge remote-tracking branch 'amstars/master'

Conflicts:
	source/CNAME
Dates
Merging amy's fixes