changes to galaxy objects to improve code
Merge branch 'master' into develop
fix trophy image sizes
fix trophy image sizes