-Hopefully fixed ckEditor not respecting assets.
Merge pull request #1205 from mmcguinn/mm1151

-Hopefully fixed ckEditor not respecting assets.
Merge remote-tracking branch 'upstream/master' into jpSessionsBranch