Place repo details in the url.
Set the branch to '', that makes it use the default.

It also means the repo in the url does not by default contain /branch/master.
Merge branch 'master' into repo-in-url
Improvements suggested by @philschatz and @tmsp1
Merge branch 'master' into repo-in-url
URLEncode the id as a whole, not as a component.

This simple change means that a slash (/) is no longer encoded as %2F. This
makes the url much easier to read.
Remove accidental addition of underscore dependency
Repair the regex that detects the path for the copy plugin.
Replace the pencil icon with mockup-supplied png.
Show friendly name for content

So when you hover over the pencil icon, it tells you whether it is a book or a
module.
Show the pencil icons on the workspace side.
Turn edit pencil into a dropdown, allow user also to edit.
Enable bootstrap tooltips on menu items.
Revert "Replace the pencil icon with mockup-supplied png."

This reverts commit 4a3a409f315eb49aaed60fa71a504af898ea82eb.

Conflicts:

	styles/workspace/sidebar.less
Restore some styling lost in the revert merge-conflict.
highlight current file in toc sidebar
make active book highlight in workspace picker
make toc highlighting work when clicking on a book in the picker
fix bug where you can't hide the active file
Copy and paste is always visible.

This goes with new changes in the copy plugin that enables/disables the
button rather than hiding it. Fixes jitter in the ui as well.