sync with Ed's world
Merge branch 'master' of https://github.com/edburton/IconDoBetter

Conflicts:
	src/ContentHub.mm