CONN-53 subtask CONN-145: ui components complete.
CONN-53 subtask CONN-145: code complete.
CONN-53 subtask CONN-145: integrating CONN-148.
CONN-53 subtask CONN-145: bug fixes after integrating with CONN-148.
Merge pull request #3 from msweaver/master

CONN-145