Added edge subsampling back for boxes; disabled multiple normals when contact normal for box is degenerate
Moved Color.h to source directory