Award2 model
Don't create unlabled award
Fix award2 merge issue
Add comments
Award2 manipulator tests
Description of AwardType
Better comments & var names in award parser
rename Award2 to Award
team becomes team_list in new Award model
More renaming of Award2 to Award
remove old award model
Move parsing AwardType from name_str to helper function
add tests for award type parsing
Use appengine 1.8.7 for testing
Merge pull request #807 from fangeugene/awards2

New Award Model