loaded dumpdata from entries made last night, modified models

+ added labels to models for human-friendly form field labels
+ removed principal from group sorting
+ renamed storage_type to asset_type
+ added grouping to teamperature_choices list