Merge branch 'master' into Adam-Jones
correct padding issues in Select a Color
Merge branch 'Adam-Jones'