Add edge property
Refactor HJHPopoverView
Merge remote-tracking branch 'Github/master'