The UsersController needs to set @trophies to a list of GenericFiles
Removed patches for rails 3
Merge pull request #284 from projecthydra/fix_trophies

The UsersController needs to set @trophies to a list of GenericFiles
Merge pull request #286 from projecthydra/remove_rails3

Removed patches for rails 3