Fix #259 - block editor gives fatal error
Add menu options to merge and renumber trees
Merge remote-tracking branch 'webtrees-base/master' into develop