undoing word count
Merge branch 'develop' of github.com:meedan/meedan-nurani into develop

Conflicts:
	drupal/sites/all/libraries/ckeditor/.htaccess
	drupal/sites/all/libraries/ckeditor/CHANGES.html
	drupal/sites/all/libraries/ckeditor/INSTALL.html
	drupal/sites/all/libraries/ckeditor/LICENSE.html
	drupal/sites/all/libraries/ckeditor/_samples/adobeair/application.xml
	drupal/sites/all/libraries/ckeditor/_samples/adobeair/run.bat
	drupal/sites/all/libraries/ckeditor/_samples/adobeair/sample.html
	drupal/sites/all/libraries/ckeditor/_samples/ajax.html
	drupal/sites/all/libraries/ckeditor/_samples/api.html
	drupal/sites/all/libraries/ckeditor/_samples/api_dialog.html
	drupal/sites/all/libraries/ckeditor/_samples/api_dialog/my_dialog.js
	drupal/sites/all/libraries/ckeditor/_samples/asp/advanced.asp
	drupal/sites/all/libraries/ckeditor/_samples/asp/events.asp
	drupal/sites/all/libraries/ckeditor/_samples/asp/index.html
	drupal/sites/all/libraries/ckeditor/_samples/asp/replace.asp
	drupal/sites/all/libraries/ckeditor/_samples/asp/replaceall.asp
	drupal/sites/all/libraries/ckeditor/_samples/asp/sample_posteddata.asp
	drupal/sites/all/libraries/ckeditor/_samples/asp/standalone.asp
	drupal/sites/all/libraries/ckeditor/_samples/assets/_posteddata.php
	drupal/sites/all/libraries/ckeditor/_samples/assets/output_xhtml.css
	drupal/sites/all/libraries/ckeditor/_samples/assets/parsesample.css
	drupal/sites/all/libraries/ckeditor/_samples/assets/swfobject.js
	drupal/sites/all/libraries/ckeditor/_samples/autogrow.html
	drupal/sites/all/libraries/ckeditor/_samples/bbcode.html
	drupal/sites/all/libraries/ckeditor/_samples/devtools.html
	drupal/sites/all/libraries/ckeditor/_samples/divreplace.html
	drupal/sites/all/libraries/ckeditor/_samples/enterkey.html
	drupal/sites/all/libraries/ckeditor/_samples/fullpage.html
	drupal/sites/all/libraries/ckeditor/_samples/index.html
	drupal/sites/all/libraries/ckeditor/_samples/jqueryadapter.html
	drupal/sites/all/libraries/ckeditor/_samples/output_for_flash.html
	drupal/sites/all/libraries/ckeditor/_samples/output_html.html
	drupal/sites/all/libraries/ckeditor/_samples/output_xhtml.html
	drupal/sites/all/libraries/ckeditor/_samples/php/advanced.php
	drupal/sites/all/libraries/ckeditor/_samples/php/events.php
	drupal/sites/all/libraries/ckeditor/_samples/php/index.html
	drupal/sites/all/libraries/ckeditor/_samples/php/replace.php
	drupal/sites/all/libraries/ckeditor/_samples/php/replaceall.php
	drupal/sites/all/libraries/ckeditor/_samples/php/standalone.php
	drupal/sites/all/libraries/ckeditor/_samples/placeholder.html
	drupal/sites/all/libraries/ckeditor/_samples/readonly.html
	drupal/sites/all/libraries/ckeditor/_samples/replacebyclass.html
	drupal/sites/all/libraries/ckeditor/_samples/replacebycode.html
	drupal/sites/all/libraries/ckeditor/_samples/sample.css
	drupal/sites/all/libraries/ckeditor/_samples/sample.js
	drupal/sites/all/libraries/ckeditor/_samples/sample_posteddata.php
	drupal/sites/all/libraries/ckeditor/_samples/sharedspaces.html
	drupal/sites/all/libraries/ckeditor/_samples/skins.html
	drupal/sites/all/libraries/ckeditor/_samples/stylesheetparser.html
	drupal/sites/all/libraries/ckeditor/_samples/tableresize.html
	drupal/sites/all/libraries/ckeditor/_samples/ui_color.html
	drupal/sites/all/libraries/ckeditor/_samples/ui_languages.html
	drupal/sites/all/libraries/ckeditor/_source/adapters/jquery.js
	drupal/sites/all/libraries/ckeditor/_source/core/_bootstrap.js
	drupal/sites/all/libraries/ckeditor/_source/core/ckeditor.js
	drupal/sites/all/libraries/ckeditor/_source/core/ckeditor_base.js
	drupal/sites/all/libraries/ckeditor/_source/core/ckeditor_basic.js
	drupal/sites/all/libraries/ckeditor/_source/core/command.js
	drupal/sites/all/libraries/ckeditor/_source/core/commanddefinition.js
	drupal/sites/all/libraries/ckeditor/_source/core/config.js
	drupal/sites/all/libraries/ckeditor/_source/core/dataprocessor.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/comment.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/document.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/documentfragment.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/domobject.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/element.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/elementpath.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/event.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/node.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/nodelist.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/range.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/rangelist.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/text.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/walker.js
	drupal/sites/all/libraries/ckeditor/_source/core/dom/window.js
	drupal/sites/all/libraries/ckeditor/_source/core/dtd.js
	drupal/sites/all/libraries/ckeditor/_source/core/editor.js
	drupal/sites/all/libraries/ckeditor/_source/core/editor_basic.js
	drupal/sites/all/libraries/ckeditor/_source/core/env.js
	drupal/sites/all/libraries/ckeditor/_source/core/event.js
	drupal/sites/all/libraries/ckeditor/_source/core/eventInfo.js
	drupal/sites/all/libraries/ckeditor/_source/core/focusmanager.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser/basicwriter.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser/cdata.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser/comment.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser/element.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser/filter.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser/fragment.js
	drupal/sites/all/libraries/ckeditor/_source/core/htmlparser/text.js
	drupal/sites/all/libraries/ckeditor/_source/core/lang.js
	drupal/sites/all/libraries/ckeditor/_source/core/loader.js
	drupal/sites/all/libraries/ckeditor/_source/core/plugindefinition.js
	drupal/sites/all/libraries/ckeditor/_source/core/plugins.js
	drupal/sites/all/libraries/ckeditor/_source/core/resourcemanager.js
	drupal/sites/all/libraries/ckeditor/_source/core/scriptloader.js
	drupal/sites/all/libraries/ckeditor/_source/core/skins.js
	drupal/sites/all/libraries/ckeditor/_source/core/themes.js
	drupal/sites/all/libraries/ckeditor/_source/core/tools.js
	drupal/sites/all/libraries/ckeditor/_source/core/ui.js
	drupal/sites/all/libraries/ckeditor/_source/lang/_languages.js
	drupal/sites/all/libraries/ckeditor/_source/lang/_translationstatus.txt
	drupal/sites/all/libraries/ckeditor/_source/lang/af.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ar.js
	drupal/sites/all/libraries/ckeditor/_source/lang/bg.js
	drupal/sites/all/libraries/ckeditor/_source/lang/bn.js
	drupal/sites/all/libraries/ckeditor/_source/lang/bs.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ca.js
	drupal/sites/all/libraries/ckeditor/_source/lang/cs.js
	drupal/sites/all/libraries/ckeditor/_source/lang/cy.js
	drupal/sites/all/libraries/ckeditor/_source/lang/da.js
	drupal/sites/all/libraries/ckeditor/_source/lang/de.js
	drupal/sites/all/libraries/ckeditor/_source/lang/el.js
	drupal/sites/all/libraries/ckeditor/_source/lang/en-au.js
	drupal/sites/all/libraries/ckeditor/_source/lang/en-ca.js
	drupal/sites/all/libraries/ckeditor/_source/lang/en-gb.js
	drupal/sites/all/libraries/ckeditor/_source/lang/en.js
	drupal/sites/all/libraries/ckeditor/_source/lang/eo.js
	drupal/sites/all/libraries/ckeditor/_source/lang/es.js
	drupal/sites/all/libraries/ckeditor/_source/lang/et.js
	drupal/sites/all/libraries/ckeditor/_source/lang/eu.js
	drupal/sites/all/libraries/ckeditor/_source/lang/fa.js
	drupal/sites/all/libraries/ckeditor/_source/lang/fi.js
	drupal/sites/all/libraries/ckeditor/_source/lang/fo.js
	drupal/sites/all/libraries/ckeditor/_source/lang/fr-ca.js
	drupal/sites/all/libraries/ckeditor/_source/lang/fr.js
	drupal/sites/all/libraries/ckeditor/_source/lang/gl.js
	drupal/sites/all/libraries/ckeditor/_source/lang/gu.js
	drupal/sites/all/libraries/ckeditor/_source/lang/he.js
	drupal/sites/all/libraries/ckeditor/_source/lang/hi.js
	drupal/sites/all/libraries/ckeditor/_source/lang/hr.js
	drupal/sites/all/libraries/ckeditor/_source/lang/hu.js
	drupal/sites/all/libraries/ckeditor/_source/lang/is.js
	drupal/sites/all/libraries/ckeditor/_source/lang/it.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ja.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ka.js
	drupal/sites/all/libraries/ckeditor/_source/lang/km.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ko.js
	drupal/sites/all/libraries/ckeditor/_source/lang/lt.js
	drupal/sites/all/libraries/ckeditor/_source/lang/lv.js
	drupal/sites/all/libraries/ckeditor/_source/lang/mn.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ms.js
	drupal/sites/all/libraries/ckeditor/_source/lang/nb.js
	drupal/sites/all/libraries/ckeditor/_source/lang/nl.js
	drupal/sites/all/libraries/ckeditor/_source/lang/no.js
	drupal/sites/all/libraries/ckeditor/_source/lang/pl.js
	drupal/sites/all/libraries/ckeditor/_source/lang/pt-br.js
	drupal/sites/all/libraries/ckeditor/_source/lang/pt.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ro.js
	drupal/sites/all/libraries/ckeditor/_source/lang/ru.js
	drupal/sites/all/libraries/ckeditor/_source/lang/sk.js
	drupal/sites/all/libraries/ckeditor/_source/lang/sl.js
	drupal/sites/all/libraries/ckeditor/_source/lang/sr-latn.js
	drupal/sites/all/libraries/ckeditor/_source/lang/sr.js
	drupal/sites/all/libraries/ckeditor/_source/lang/sv.js
	drupal/sites/all/libraries/ckeditor/_source/lang/th.js
	drupal/sites/all/libraries/ckeditor/_source/lang/tr.js
	drupal/sites/all/libraries/ckeditor/_source/lang/uk.js
	drupal/sites/all/libraries/ckeditor/_source/lang/vi.js
	drupal/sites/all/libraries/ckeditor/_source/lang/zh-cn.js
	drupal/sites/all/libraries/ckeditor/_source/lang/zh.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/a11yhelp/dialogs/a11yhelp.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/a11yhelp/lang/en.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/a11yhelp/lang/he.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/a11yhelp/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/about/dialogs/about.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/about/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/adobeair/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/ajax/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/autogrow/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/basicstyles/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/bbcode/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/bidi/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/blockquote/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/button/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/clipboard/dialogs/paste.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/clipboard/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/colorbutton/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/colordialog/dialogs/colordialog.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/colordialog/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/contextmenu/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/devtools/lang/en.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/devtools/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/dialog/dialogDefinition.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/dialog/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/dialogadvtab/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/dialogui/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/div/dialogs/div.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/div/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/docprops/dialogs/docprops.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/docprops/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/domiterator/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/editingblock/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/elementspath/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/enterkey/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/entities/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/fakeobjects/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/filebrowser/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/find/dialogs/find.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/find/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/flash/dialogs/flash.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/flash/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/floatpanel/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/font/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/format/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/button.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/checkbox.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/form.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/hiddenfield.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/radio.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/select.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/textarea.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/dialogs/textfield.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/forms/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/horizontalrule/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/htmldataprocessor/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/htmlwriter/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/iframe/dialogs/iframe.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/iframe/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/iframedialog/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/image/dialogs/image.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/image/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/indent/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/justify/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/keystrokes/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/link/dialogs/anchor.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/link/dialogs/link.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/link/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/list/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/listblock/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/liststyle/dialogs/liststyle.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/liststyle/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/maximize/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/menu/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/menubutton/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/newpage/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/pagebreak/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/panel/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/panelbutton/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/pastefromword/filter/default.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/pastefromword/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/pastetext/dialogs/pastetext.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/pastetext/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/placeholder/dialogs/placeholder.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/placeholder/lang/en.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/placeholder/lang/he.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/placeholder/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/popup/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/preview/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/print/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/removeformat/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/resize/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/richcombo/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/save/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/scayt/dialogs/options.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/scayt/dialogs/toolbar.css
	drupal/sites/all/libraries/ckeditor/_source/plugins/scayt/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/selection/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/showblocks/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/showborders/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/smiley/dialogs/smiley.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/smiley/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/sourcearea/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/specialchar/dialogs/specialchar.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/specialchar/lang/en.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/specialchar/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/styles/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/styles/styles/default.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/stylescombo/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/stylesheetparser/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/tab/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/table/dialogs/table.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/table/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/tableresize/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/tabletools/dialogs/tableCell.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/tabletools/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/templates/dialogs/templates.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/templates/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/templates/templates/default.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/toolbar/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/uicolor/dialogs/uicolor.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/uicolor/lang/en.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/uicolor/lang/he.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/uicolor/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/uicolor/yui/assets/yui.css
	drupal/sites/all/libraries/ckeditor/_source/plugins/uicolor/yui/yui.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/undo/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/wsc/dialogs/ciframe.html
	drupal/sites/all/libraries/ckeditor/_source/plugins/wsc/dialogs/tmpFrameset.html
	drupal/sites/all/libraries/ckeditor/_source/plugins/wsc/dialogs/wsc.css
	drupal/sites/all/libraries/ckeditor/_source/plugins/wsc/dialogs/wsc.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/wsc/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/wysiwygarea/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/plugins/xml/plugin.js
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/dialog.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/editor.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/elementspath.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/icons.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/mainui.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/menu.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/panel.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/presets.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/reset.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/richcombo.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/skin.js
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/templates.css
	drupal/sites/all/libraries/ckeditor/_source/skins/kama/toolbar.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/dialog.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/editor.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/elementspath.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/icons.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/mainui.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/menu.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/panel.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/presets.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/reset.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/richcombo.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/skin.js
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/templates.css
	drupal/sites/all/libraries/ckeditor/_source/skins/office2003/toolbar.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/dialog.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/editor.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/elementspath.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/icons.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/mainui.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/menu.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/panel.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/presets.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/reset.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/richcombo.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/skin.js
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/templates.css
	drupal/sites/all/libraries/ckeditor/_source/skins/v2/toolbar.css
	drupal/sites/all/libraries/ckeditor/_source/themes/default/theme.js
	drupal/sites/all/libraries/ckeditor/adapters/jquery.js
	drupal/sites/all/libraries/ckeditor/ckeditor.asp
	drupal/sites/all/libraries/ckeditor/ckeditor.js
	drupal/sites/all/libraries/ckeditor/ckeditor.pack
	drupal/sites/all/libraries/ckeditor/ckeditor.php
	drupal/sites/all/libraries/ckeditor/ckeditor_basic.js
	drupal/sites/all/libraries/ckeditor/ckeditor_basic_source.js
	drupal/sites/all/libraries/ckeditor/ckeditor_php4.php
	drupal/sites/all/libraries/ckeditor/ckeditor_php5.php
	drupal/sites/all/libraries/ckeditor/ckeditor_source.js
	drupal/sites/all/libraries/ckeditor/config.js
	drupal/sites/all/libraries/ckeditor/contents.css
	drupal/sites/all/libraries/ckeditor/lang/_languages.js
	drupal/sites/all/libraries/ckeditor/lang/_translationstatus.txt
	drupal/sites/all/libraries/ckeditor/lang/af.js
	drupal/sites/all/libraries/ckeditor/lang/ar.js
	drupal/sites/all/libraries/ckeditor/lang/bg.js
	drupal/sites/all/libraries/ckeditor/lang/bn.js
	drupal/sites/all/libraries/ckeditor/lang/bs.js
	drupal/sites/all/libraries/ckeditor/lang/ca.js
	drupal/sites/all/libraries/ckeditor/lang/cs.js
	drupal/sites/all/libraries/ckeditor/lang/cy.js
	drupal/sites/all/libraries/ckeditor/lang/da.js
	drupal/sites/all/libraries/ckeditor/lang/de.js
	drupal/sites/all/libraries/ckeditor/lang/el.js
	drupal/sites/all/libraries/ckeditor/lang/en-au.js
	drupal/sites/all/libraries/ckeditor/lang/en-ca.js
	drupal/sites/all/libraries/ckeditor/lang/en-gb.js
	drupal/sites/all/libraries/ckeditor/lang/en.js
	drupal/sites/all/libraries/ckeditor/lang/eo.js
	drupal/sites/all/libraries/ckeditor/lang/es.js
	drupal/sites/all/libraries/ckeditor/lang/et.js
	drupal/sites/all/libraries/ckeditor/lang/eu.js
	drupal/sites/all/libraries/ckeditor/lang/fa.js
	drupal/sites/all/libraries/ckeditor/lang/fi.js
	drupal/sites/all/libraries/ckeditor/lang/fo.js
	drupal/sites/all/libraries/ckeditor/lang/fr-ca.js
	drupal/sites/all/libraries/ckeditor/lang/fr.js
	drupal/sites/all/libraries/ckeditor/lang/gl.js
	drupal/sites/all/libraries/ckeditor/lang/gu.js
	drupal/sites/all/libraries/ckeditor/lang/he.js
	drupal/sites/all/libraries/ckeditor/lang/hi.js
	drupal/sites/all/libraries/ckeditor/lang/hr.js
	drupal/sites/all/libraries/ckeditor/lang/hu.js
	drupal/sites/all/libraries/ckeditor/lang/is.js
	drupal/sites/all/libraries/ckeditor/lang/it.js
	drupal/sites/all/libraries/ckeditor/lang/ja.js
	drupal/sites/all/libraries/ckeditor/lang/ka.js
	drupal/sites/all/libraries/ckeditor/lang/km.js
	drupal/sites/all/libraries/ckeditor/lang/ko.js
	drupal/sites/all/libraries/ckeditor/lang/lt.js
	drupal/sites/all/libraries/ckeditor/lang/lv.js
	drupal/sites/all/libraries/ckeditor/lang/mn.js
	drupal/sites/all/libraries/ckeditor/lang/ms.js
	drupal/sites/all/libraries/ckeditor/lang/nb.js
	drupal/sites/all/libraries/ckeditor/lang/nl.js
	drupal/sites/all/libraries/ckeditor/lang/no.js
	drupal/sites/all/libraries/ckeditor/lang/pl.js
	drupal/sites/all/libraries/ckeditor/lang/pt-br.js
	drupal/sites/all/libraries/ckeditor/lang/pt.js
	drupal/sites/all/libraries/ckeditor/lang/ro.js
	drupal/sites/all/libraries/ckeditor/lang/ru.js
	drupal/sites/all/libraries/ckeditor/lang/sk.js
	drupal/sites/all/libraries/ckeditor/lang/sl.js
	drupal/sites/all/libraries/ckeditor/lang/sr-latn.js
	drupal/sites/all/libraries/ckeditor/lang/sr.js
	drupal/sites/all/libraries/ckeditor/lang/sv.js
	drupal/sites/all/libraries/ckeditor/lang/th.js
	drupal/sites/all/libraries/ckeditor/lang/tr.js
	drupal/sites/all/libraries/ckeditor/lang/uk.js
	drupal/sites/all/libraries/ckeditor/lang/vi.js
	drupal/sites/all/libraries/ckeditor/lang/zh-cn.js
	drupal/sites/all/libraries/ckeditor/lang/zh.js
	drupal/sites/all/libraries/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
	drupal/sites/all/libraries/ckeditor/plugins/a11yhelp/lang/en.js
	drupal/sites/all/libraries/ckeditor/plugins/a11yhelp/lang/he.js
	drupal/sites/all/libraries/ckeditor/plugins/about/dialogs/about.js
	drupal/sites/all/libraries/ckeditor/plugins/adobeair/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/ajax/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/autogrow/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/bbcode/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/clipboard/dialogs/paste.js
	drupal/sites/all/libraries/ckeditor/plugins/colordialog/dialogs/colordialog.js
	drupal/sites/all/libraries/ckeditor/plugins/devtools/lang/en.js
	drupal/sites/all/libraries/ckeditor/plugins/devtools/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/dialog/dialogDefinition.js
	drupal/sites/all/libraries/ckeditor/plugins/div/dialogs/div.js
	drupal/sites/all/libraries/ckeditor/plugins/docprops/dialogs/docprops.js
	drupal/sites/all/libraries/ckeditor/plugins/docprops/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/find/dialogs/find.js
	drupal/sites/all/libraries/ckeditor/plugins/flash/dialogs/flash.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/button.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/checkbox.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/form.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/hiddenfield.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/radio.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/select.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/textarea.js
	drupal/sites/all/libraries/ckeditor/plugins/forms/dialogs/textfield.js
	drupal/sites/all/libraries/ckeditor/plugins/iframe/dialogs/iframe.js
	drupal/sites/all/libraries/ckeditor/plugins/iframedialog/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/image/dialogs/image.js
	drupal/sites/all/libraries/ckeditor/plugins/link/dialogs/anchor.js
	drupal/sites/all/libraries/ckeditor/plugins/link/dialogs/link.js
	drupal/sites/all/libraries/ckeditor/plugins/liststyle/dialogs/liststyle.js
	drupal/sites/all/libraries/ckeditor/plugins/pastefromword/filter/default.js
	drupal/sites/all/libraries/ckeditor/plugins/pastetext/dialogs/pastetext.js
	drupal/sites/all/libraries/ckeditor/plugins/placeholder/dialogs/placeholder.js
	drupal/sites/all/libraries/ckeditor/plugins/placeholder/lang/en.js
	drupal/sites/all/libraries/ckeditor/plugins/placeholder/lang/he.js
	drupal/sites/all/libraries/ckeditor/plugins/placeholder/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/scayt/dialogs/options.js
	drupal/sites/all/libraries/ckeditor/plugins/scayt/dialogs/toolbar.css
	drupal/sites/all/libraries/ckeditor/plugins/smiley/dialogs/smiley.js
	drupal/sites/all/libraries/ckeditor/plugins/specialchar/dialogs/specialchar.js
	drupal/sites/all/libraries/ckeditor/plugins/specialchar/lang/en.js
	drupal/sites/all/libraries/ckeditor/plugins/styles/styles/default.js
	drupal/sites/all/libraries/ckeditor/plugins/stylesheetparser/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/table/dialogs/table.js
	drupal/sites/all/libraries/ckeditor/plugins/tableresize/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/tabletools/dialogs/tableCell.js
	drupal/sites/all/libraries/ckeditor/plugins/templates/dialogs/templates.js
	drupal/sites/all/libraries/ckeditor/plugins/templates/templates/default.js
	drupal/sites/all/libraries/ckeditor/plugins/uicolor/dialogs/uicolor.js
	drupal/sites/all/libraries/ckeditor/plugins/uicolor/lang/en.js
	drupal/sites/all/libraries/ckeditor/plugins/uicolor/lang/he.js
	drupal/sites/all/libraries/ckeditor/plugins/uicolor/plugin.js
	drupal/sites/all/libraries/ckeditor/plugins/uicolor/yui/assets/yui.css
	drupal/sites/all/libraries/ckeditor/plugins/uicolor/yui/yui.js
	drupal/sites/all/libraries/ckeditor/plugins/wsc/dialogs/ciframe.html
	drupal/sites/all/libraries/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
	drupal/sites/all/libraries/ckeditor/plugins/wsc/dialogs/wsc.css
	drupal/sites/all/libraries/ckeditor/plugins/wsc/dialogs/wsc.js
	drupal/sites/all/libraries/ckeditor/plugins/xml/plugin.js
	drupal/sites/all/libraries/ckeditor/skins/kama/dialog.css
	drupal/sites/all/libraries/ckeditor/skins/kama/editor.css
	drupal/sites/all/libraries/ckeditor/skins/kama/skin.js
	drupal/sites/all/libraries/ckeditor/skins/kama/templates.css
	drupal/sites/all/libraries/ckeditor/skins/office2003/dialog.css
	drupal/sites/all/libraries/ckeditor/skins/office2003/editor.css
	drupal/sites/all/libraries/ckeditor/skins/office2003/skin.js
	drupal/sites/all/libraries/ckeditor/skins/office2003/templates.css
	drupal/sites/all/libraries/ckeditor/skins/v2/dialog.css
	drupal/sites/all/libraries/ckeditor/skins/v2/editor.css
	drupal/sites/all/libraries/ckeditor/skins/v2/skin.js
	drupal/sites/all/libraries/ckeditor/skins/v2/templates.css
	drupal/sites/all/libraries/ckeditor/themes/default/theme.js
	drupal/sites/all/modules/features/nurani_general/nurani_general.features.ckeditor_profile.inc
fixing conflicts