Updates for 1st place trophies from tournament and weapons study
Updated done feature - added trophies
Merge branch 'develop'