BUG: fix merge problems

Reinstated a layout, removed unnecessary changes to the UI.
STYLE: remove commented out code and extra whitespace

Conforming to Slicer style guidelines
STYLE: remove colons from labels

Conform to Slicer style guide
STYLE: add missing headers

Add copyright information and update it on ones that were
copied.
Moved some includes down to the more global level.
Conforming to Slicer style guidelines.
STYLE: fix case on method name

Use lower case first letter to conform to Slicer style guidelines.
ENH: move the QColor conversion utils to qMRMLUtils

Updated Markups and Annotations to use the methods moved into
qMRMLUtils.
Also added a test (though the conversion isn't exact enough
for an equality check).