Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -r3f3b286c8daddd86677d64fcd08366c33fbfd927 -r781f0147a8670550edaf7a482d85a4504f93e564
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 3f3b286c8daddd86677d64fcd08366c33fbfd927)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 781f0147a8670550edaf7a482d85a4504f93e564)
@@ -3,12 +3,12 @@
 
 CKEDITOR.config.toolbar_Default = [
 	['Source','-','Maximize','Preview','PasteFromWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath','-'], 
-	['Embed','Image','Link','Iframe','Table','HorizontalRule','Smiley','SpecialChar','Format','Font','FontSize','About']
+	['Embed','Image','Link','Iframe','Table','HorizontalRule','Emojione','SpecialChar','Format','Font','FontSize','About']
 ];
 
 CKEDITOR.config.toolbar_DefaultInline = [
 	['Sourcedialog','Preview','-','PasteFromWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath','-'], 
-    ['Embed','Image','Link','Iframe','Table','HorizontalRule','Smiley','SpecialChar','Format','Font','FontSize','About']
+    ['Embed','Image','Link','Iframe','Table','HorizontalRule','Emojione','SpecialChar','Format','Font','FontSize','About']
 ];
 
 CKEDITOR.config.toolbar_DefaultDokuInline = [
@@ -26,7 +26,7 @@
 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	['Jlatexmath','About'],
 	['TextColor','BGColor'],
-	['Image','Table','HorizontalRule','Smiley','SpecialChar'],
+	['Image','Table','HorizontalRule','Emojione','SpecialChar'],
 	['Format','Font','FontSize']
 ];
 
@@ -38,7 +38,7 @@
   	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
   	['Jlatexmath','About'],
   	['TextColor','BGColor'],
-  	['Image','Table','HorizontalRule','Smiley','SpecialChar'],
+  	['Image','Table','HorizontalRule','Emojione','SpecialChar'],
   	['Format','Font','FontSize']
   ];
 
@@ -50,7 +50,7 @@
 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	['Jlatexmath','About'],
 	['TextColor','BGColor'],
-	['Table','HorizontalRule','Smiley','SpecialChar'],
+	['Table','HorizontalRule','Emojione','SpecialChar'],
 	['Format','Font','FontSize']
 ];
 
@@ -62,7 +62,7 @@
   	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
   	['Jlatexmath','About'],
   	['TextColor','BGColor'],
-  	['Table','HorizontalRule','Smiley','SpecialChar'],
+  	['Table','HorizontalRule','Emojione','SpecialChar'],
   	['Format','Font','FontSize']
 ];
 
@@ -75,7 +75,7 @@
 	['wikilink','Link','Image'],
 	['Jlatexmath','About'],
 	['TextColor','BGColor'],
-	['Table','HorizontalRule','Smiley','SpecialChar'],
+	['Table','HorizontalRule','Emojione','SpecialChar'],
 	['Format','Font','FontSize']
 ];
 
@@ -88,27 +88,27 @@
   	['wikilink','Link','Image'],
   	['Jlatexmath','About'],
   	['TextColor','BGColor'],
-  	['Table','HorizontalRule','Smiley','SpecialChar'],
+  	['Table','HorizontalRule','Emojione','SpecialChar'],
   	['Format','Font','FontSize']
 ];
 
 
 CKEDITOR.config.toolbar_CustomPedplanner = [
 	['Source','-','Maximize','Preview','PasteFromWord','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath'], 
-	['Image','Link','Iframe','Table','Smiley','Font','FontSize']
+	['Image','Link','Iframe','Table','Emojione','Font','FontSize']
 ];
 
 CKEDITOR.config.toolbar_CustomPedplannerInline = [
 	['Sourcedialog','-','PasteFromWord','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Jlatexmath'], 
-	['Image','Link','Iframe','Table','Smiley','Font','FontSize']
+	['Image','Link','Iframe','Table','Emojione','Font','FontSize']
 ];
 
 CKEDITOR.config.toolbar_LessonDescription = [
     ['Bold','Italic','Underline', '-','Subscript','Superscript'],
 	['NumberedList','BulletedList','-','Outdent','Indent'],
 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	['TextColor','BGColor'],
-	['Table','HorizontalRule','Smiley','SpecialChar'],
+	['Table','HorizontalRule','Emojione','SpecialChar'],
 	['Format','Font','FontSize']
 ];
 
@@ -117,7 +117,7 @@
  	['NumberedList','BulletedList','-','Outdent','Indent'],
  	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
  	['TextColor','BGColor'],
- 	['Table','HorizontalRule','Smiley','SpecialChar'],
+ 	['Table','HorizontalRule','Emojione','SpecialChar'],
  	['Format','Font','FontSize']
  ];
 
@@ -129,7 +129,7 @@
 CKEDITOR.config.format_tags	= 'div;h1;h2;h3;h4;h5;h6;pre;address;p' ;
 CKEDITOR.config.enterMode = 'div';
 CKEDITOR.plugins.addExternal('wikilink', CKEDITOR.basePath + '../tool/lawiki10/wikilink/', 'plugin.js');
-CKEDITOR.config.extraPlugins = 'wikilink,jlatexmath,iframe,lineutils,widget,embed,sourcedialog,dialog';
+CKEDITOR.config.extraPlugins = 'wikilink,jlatexmath,iframe,lineutils,widget,sourcedialog,dialog';
 CKEDITOR.config.enterMode = CKEDITOR.ENTER_DIV; 
 CKEDITOR.config.removePlugins = 'elementspath';
 CKEDITOR.config.allowedContent = true;