Added Note to Aloha toolbar
Merge branch 'bookish-only' into atc