Merge pull request #1160 from stevewithington/develop

rollback CKEditor QuickEdit toolbar button override
Merge branch 'develop' of git://github.com/blueriver/MuraCMS into develop