Combine the instrument tree and the browse instruments page, fix a few problems that appeared after merging other branches
Merge remote-tracking branch 'nikki-bitbucket/instrument-tree-page' into schema-change-2014-05

* nikki-bitbucket/instrument-tree-page:
  Combine the instrument tree and the browse instruments page, fix a few problems that appeared after merging other branches