Merge resource and digital object toolbars
Merge pull request #496 from hudmol/merge-toolbars

Merge the resource & digital object toolbars into a single partial.