fixed get trophies view to get prizes also in same view
fixed conflicts
fixed conflicts
Merge pull request #478 from MGhanem/change_get_trophies_view

fixed get trophies view to get prizes also in same view