Merge branch 'atc-root-singleton' into bookish-include

Conflicts:
	scripts/gh-book/epub-container.coffee
Make github-bookeditor depend on bookish.

changes and file removals to that end.
Merge migration moved into gh-book into bookish-split.
Redo of migration view move into gh-book.

See b913940cd6d05017d03b8255915726c6c3777b78 and
715eb7b0687df000d2a36088b3a1eb9a34bbb507.
Added ctags updating script, for development purposes.
Manually merge with ghbook#master
Merge branch 'master' into bookish-include

Conflicts:
	scripts/controllers/routing.coffee
	scripts/gh-book/app.coffee
	scripts/gh-book/session.coffee
	scripts/helpers/enable-dnd.coffee
	scripts/mixins/tree.coffee
	scripts/models/content/book.coffee
	scripts/models/content/inherits/saveable.coffee
	scripts/models/workspace-root.coffee
	scripts/routers/router.coffee
	scripts/views/layouts/workspace/sidebar.coffee
	scripts/views/workspace/content/aloha-edit.coffee
	scripts/views/workspace/content/layouts/editor.coffee
	scripts/views/workspace/sidebar/toc-branch.coffee
	styles/workspace/oerpub-surroundings.less
	styles/workspace/sidebar.less
	styles/workspace/workspace.less
	templates/layouts/workspace/bookshelf.html
	templates/workspace/sidebar/toc-branch.html
	test/demo-main.js
Avoid relative less import problem with bookish

We do this by moving the @import lines from bookish/styles/main.less to the
gh-book.less file we already created for this overriding purpose.
Merge branch 'master' into bookish-include

Conflicts:
	scripts/gh-book/app.coffee
	styles/workspace/sidebar.less
	templates/layouts/workspace/bookshelf.html
	templates/layouts/workspace/table-of-contents.html
	templates/workspace/sidebar/toc.html
Merge branch 'master' into bookish-include

Conflicts:
	scripts/gh-book/app.coffee
	scripts/gh-book/session.coffee
	scripts/views/workspace/content/aloha-edit.coffee
Merge pull request #126 from oerpub/bookish-include

Bookish include
Merge remote-tracking branch 'origin/master' into 61951442-create-new-bookshelf

Conflicts:
	bower.json