Merge pull request #1098 from stevewithington/develop

ckeditor config edit
Upgrading slideshow to cycle v2
Merge branch 'develop' of github.com:blueriver/MuraCMS into develop
Upgrading slideshows to cycle v2
Adding has hasAssocImage() function to contentBeans
Fixing issue with contentFilenameArchive
Tweaking new hasImage function