Update ckeditor 6.x-1.11 ==> 6.x-1.15
Update filefield 6.x-3.12 ==> 6.x-3.13
Merge branch 'master' into 1.0-stable