Merge branch 'release/1.5.4' into develop
add bookmark sorting
fix bug where user could accidentally save over all bookmark names by moving columns
fix bugs, allow bookmark drag/drop re-ordering
Merge branch 'bookmark-sorting' into develop
bug fix for NFS vagrant machine detection with synced folders in same path
fix bugs
bump to version 1.5.5
Merge branch 'release/1.5.5'