Adds scout type to award type table
Adds rake task to update award types
Creates composites view
Generating composite dataset
Corrects where clause in view definition
composite report working
Adds composite report to menu
Changes layout of default composite report
Updates rails to 3.2.12