Add HighlightLabel control for rendering bootstrap style labels
Merge branch 'origin/develop'