update high-res badges and profile icons
Merge branch 'aaron-dev' into nathan-dev
Merge branch 'nathan-dev'