Merge pull request #1599 from ronnieduke/develop

Matching custom icons to new CK Editor Skin
Skinning CKFinder to family better with Mura
CKEditor dialog tweaks