Merge branch 'master' into color-diff

Conflicts:
	DominantColor/Shared/DominantColors.swift