Merge branch 't/10855' into major

CHANGES.md

@@ -5,7 +5,8 @@ CKEditor 4 Changelog
 
 New Features:
 
-* [#10430](http://dev.ckeditor.com/ticket/10430): Unresolved dependence of image plugin if forms plugin.
+* [#10855](http://dev.ckeditor.com/ticket/10855): Change extension of emotes in BBCode sample from GIF to PNG.
+* [#10430](http://dev.ckeditor.com/ticket/10430): Resolve dependence of image plugin if forms plugin.
 * [#10937](http://dev.ckeditor.com/ticket/10937): MathJax widget improvements:
   * loading indicator,
   * IE8 support,

plugins/bbcode/dev/bbcode.html

@@ -135,9 +135,9 @@ <h3 for="console">BBCode Output: </h3>
 		fontSize_sizes: '30/30%;50/50%;100/100%;120/120%;150/150%;200/200%;300/300%',
 		// Strip CKEditor smileys to those commonly used in BBCode.
 		smiley_images: [
-			'regular_smile.gif', 'sad_smile.gif', 'wink_smile.gif', 'teeth_smile.gif', 'tounge_smile.gif',
-			'embarrassed_smile.gif', 'omg_smile.gif', 'whatchutalkingabout_smile.gif', 'angel_smile.gif', 'shades_smile.gif',
-			'cry_smile.gif', 'kiss.gif'
+			'regular_smile.png', 'sad_smile.png', 'wink_smile.png', 'teeth_smile.png', 'tongue_smile.png',
+			'embarrassed_smile.png', 'omg_smile.png', 'whatchutalkingabout_smile.png', 'angel_smile.png',
+			'shades_smile.png', 'cry_smile.png', 'kiss.png'
 		],
 		smiley_descriptions: [
 			'smiley', 'sad', 'wink', 'laugh', 'cheeky', 'blush', 'surprise',

plugins/bbcode/samples/bbcode.html

@@ -81,9 +81,9 @@ <h1 class="samples">
 					],
 					// Strip CKEditor smileys to those commonly used in BBCode.
 					smiley_images: [
-						'regular_smile.gif', 'sad_smile.gif', 'wink_smile.gif', 'teeth_smile.gif', 'tounge_smile.gif',
-						'embarrassed_smile.gif', 'omg_smile.gif', 'whatchutalkingabout_smile.gif', 'angel_smile.gif', 'shades_smile.gif',
-						'cry_smile.gif', 'kiss.gif'
+						'regular_smile.png', 'sad_smile.png', 'wink_smile.png', 'teeth_smile.png', 'tongue_smile.png',
+						'embarrassed_smile.png', 'omg_smile.png', 'whatchutalkingabout_smile.png', 'angel_smile.png',
+						'shades_smile.png', 'cry_smile.png', 'kiss.png'
 					],
 					smiley_descriptions: [
 						'smiley', 'sad', 'wink', 'laugh', 'cheeky', 'blush', 'surprise',