Merge remote-tracking branch 'origin/team1-dev-icons' into team1-dev
Deleted test icons
Merge remote-tracking branch 'origin/team1-dev' into team1-dev-icons