BK-936 Aloha plugin to increase/decrease indent
BK-1208 Reference new code in config.py
Merge branch 'BK1208' of git://github.com/japina/Booktype into BK936
BK-1196 - Implement multiple save options
Merge branch 'BK1196' into 2.0
BK-1187 Implement note tab in the editor
Fixing conflict on merge branch
BK-1218 Update CSS file with latest changes from mockup screens
Merge branch Booktype/2.0 into local/2.0