Merge pull request #1579 from stevewithington/develop

bug fix: CKFinder folder permissions issue
remove clusterlist setting from settings.ini.cfm template
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop
Merge branch 'develop' into feature-userui