BK-773 Basic Aloha plugin for inserting links
Merge branch 'bjandras-2.0' into 2.0
BK-848 Chapters are missing icons when they are selected in Insert link dialog
BK-849 Aloha plugin for changing inline style
Merge remote-tracking branch 'sfdev/2.0' into 2.0