Merge remote-tracking branch 'origin/master' into discoverable-copy-paste
Merge remote-tracking branch 'origin/master' into discoverable-copy-paste

Conflicts:
	templates/workspace/menu/toolbar-aloha.html
Swap anchor for a button.
Merge branch 'discoverable-copy-paste' into testing
Merge branch 'testing' of github.com:oerpub/github-bookeditor into testing