small bug fix
Merge remote-tracking branch 'darrin's/master'
fixed product.swift
fixed product catalog VC, and gray color bug
Merge remote-tracking branch 'kenneth/master'