Edits to add support for double click functionality.
Merge remote-tracking branch 'origin/team1-table' into team1-table