Merge pull request #1579 from stevewithington/develop

bug fix: CKFinder folder permissions issue
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop