Merge pull request #25 from johns996/master

Merging from master
Merge branch 'master' into dev-eric
tweaks for ckeditor styles
Merge pull request #26 from johns996/dev-eric

Dev eric