Changed Redactor convertDivs setting to off
Updated Redactor to 8.2.5
Merge branch 'master' of github.com:jbroadway/elefant