Combined color name and code into color box, removed HTML above and below box
Merge branch 'combineBoxAndText'