Upgraded to CKFinder 2.3.1
Upgraded to CKEditor 3.6.6
Merge remote-tracking branch 'upstream/master'