REmove dashes in autocreated element names
resolve merge conflicts, sidebars scrollable
Merge remote-tracking branch 'origin/phil2' into github-refactor-oerpub