changes to make sure that the headings in the rich text editor use the same styles as the classes given by .h2() etc
Merge remote-tracking branch 'origin/master'