fixes Highlightable trait, adds unit tests to Highlightable
Merge remote-tracking branch 'origin/master'
adds unit tests to Expandable, renames retractWidget to contractWidget (breaking)
removes unnecessary TODO