Merge branch 'master' into Docs

Author: S-Haime

forms.py

@@ -101,7 +101,7 @@ def __init__(self, *args, **kwargs):
 
     class Meta:
         model = models.Chapter
-        exclude = ('book', 'filename')
+        exclude = ('book', 'filename', 'keywords', 'publisher_notes')
 
     def save(self, commit=True, book=None, *args, **kwargs):
         save_chapter = super(ChapterForm, self).save(commit=False)