Merge branch 'master' into Updates

Conflicts:
	sites/all/modules/ckeditor/ckeditor/CHANGES.md
	sites/all/modules/ckeditor/ckeditor/build-config.js
	sites/all/modules/ckeditor/ckeditor/ckeditor.js
	sites/all/modules/ckeditor/ckeditor/config.js
	sites/all/modules/ckeditor/ckeditor/lang/af.js
	sites/all/modules/ckeditor/ckeditor/lang/ar.js
	sites/all/modules/ckeditor/ckeditor/lang/bg.js
	sites/all/modules/ckeditor/ckeditor/lang/bn.js
	sites/all/modules/ckeditor/ckeditor/lang/bs.js
	sites/all/modules/ckeditor/ckeditor/lang/ca.js
	sites/all/modules/ckeditor/ckeditor/lang/cs.js
	sites/all/modules/ckeditor/ckeditor/lang/cy.js
	sites/all/modules/ckeditor/ckeditor/lang/da.js
	sites/all/modules/ckeditor/ckeditor/lang/de.js
	sites/all/modules/ckeditor/ckeditor/lang/el.js
	sites/all/modules/ckeditor/ckeditor/lang/en-au.js
	sites/all/modules/ckeditor/ckeditor/lang/en-ca.js
	sites/all/modules/ckeditor/ckeditor/lang/en-gb.js
	sites/all/modules/ckeditor/ckeditor/lang/eo.js
	sites/all/modules/ckeditor/ckeditor/lang/es.js
	sites/all/modules/ckeditor/ckeditor/lang/et.js
	sites/all/modules/ckeditor/ckeditor/lang/eu.js
	sites/all/modules/ckeditor/ckeditor/lang/fa.js
	sites/all/modules/ckeditor/ckeditor/lang/fi.js
	sites/all/modules/ckeditor/ckeditor/lang/fo.js
	sites/all/modules/ckeditor/ckeditor/lang/fr-ca.js
	sites/all/modules/ckeditor/ckeditor/lang/fr.js
	sites/all/modules/ckeditor/ckeditor/lang/gl.js
	sites/all/modules/ckeditor/ckeditor/lang/gu.js
	sites/all/modules/ckeditor/ckeditor/lang/he.js
	sites/all/modules/ckeditor/ckeditor/lang/hi.js
	sites/all/modules/ckeditor/ckeditor/lang/hr.js
	sites/all/modules/ckeditor/ckeditor/lang/hu.js
	sites/all/modules/ckeditor/ckeditor/lang/id.js
	sites/all/modules/ckeditor/ckeditor/lang/is.js
	sites/all/modules/ckeditor/ckeditor/lang/it.js
	sites/all/modules/ckeditor/ckeditor/lang/ja.js
	sites/all/modules/ckeditor/ckeditor/lang/ka.js
	sites/all/modules/ckeditor/ckeditor/lang/km.js
	sites/all/modules/ckeditor/ckeditor/lang/ko.js
	sites/all/modules/ckeditor/ckeditor/lang/ku.js
	sites/all/modules/ckeditor/ckeditor/lang/lt.js
	sites/all/modules/ckeditor/ckeditor/lang/lv.js
	sites/all/modules/ckeditor/ckeditor/lang/mk.js
	sites/all/modules/ckeditor/ckeditor/lang/mn.js
	sites/all/modules/ckeditor/ckeditor/lang/ms.js
	sites/all/modules/ckeditor/ckeditor/lang/nb.js
	sites/all/modules/ckeditor/ckeditor/lang/nl.js
	sites/all/modules/ckeditor/ckeditor/lang/no.js
	sites/all/modules/ckeditor/ckeditor/lang/pl.js
	sites/all/modules/ckeditor/ckeditor/lang/pt-br.js
	sites/all/modules/ckeditor/ckeditor/lang/pt.js
	sites/all/modules/ckeditor/ckeditor/lang/ro.js
	sites/all/modules/ckeditor/ckeditor/lang/ru.js
	sites/all/modules/ckeditor/ckeditor/lang/si.js
	sites/all/modules/ckeditor/ckeditor/lang/sk.js
	sites/all/modules/ckeditor/ckeditor/lang/sl.js
	sites/all/modules/ckeditor/ckeditor/lang/sq.js
	sites/all/modules/ckeditor/ckeditor/lang/sr-latn.js
	sites/all/modules/ckeditor/ckeditor/lang/sr.js
	sites/all/modules/ckeditor/ckeditor/lang/sv.js
	sites/all/modules/ckeditor/ckeditor/lang/th.js
	sites/all/modules/ckeditor/ckeditor/lang/tr.js
	sites/all/modules/ckeditor/ckeditor/lang/tt.js
	sites/all/modules/ckeditor/ckeditor/lang/ug.js
	sites/all/modules/ckeditor/ckeditor/lang/uk.js
	sites/all/modules/ckeditor/ckeditor/lang/vi.js
	sites/all/modules/ckeditor/ckeditor/lang/zh-cn.js
	sites/all/modules/ckeditor/ckeditor/lang/zh.js
	sites/all/modules/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
	sites/all/modules/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
	sites/all/modules/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
	sites/all/modules/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
	sites/all/modules/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
	sites/all/modules/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
	sites/all/modules/ckeditor/ckeditor/plugins/about/dialogs/about.js

sites/all/modules/ckeditor/ckeditor/plugins/iframe/images/placeholder.pn
g
	sites/all/modules/ckeditor/ckeditor/plugins/image/dialogs/image.js
	sites/all/modules/ckeditor/ckeditor/plugins/link/images/anchor.png

sites/all/modules/ckeditor/ckeditor/plugins/link/images/hidpi/anchor.png

sites/all/modules/ckeditor/ckeditor/plugins/magicline/images/hidpi/icon.
png
	sites/all/modules/ckeditor/ckeditor/plugins/magicline/images/icon.png

sites/all/modules/ckeditor/ckeditor/plugins/pastefromword/filter/default
.js

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_addr
ess.png

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_bloc
kquote.png

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_div.
png

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_h1.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_h2.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_h3.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_h4.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_h5.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_h6.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_p.pn
g

sites/all/modules/ckeditor/ckeditor/plugins/showblocks/images/block_pre.
png

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/angel_smile.gi
f

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/angel_smile.pn
g

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/angry_smile.gi
f

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/angry_smile.pn
g

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/broken_heart.g
if

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/broken_heart.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/confused_smile
.gif

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/confused_smile
.png
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/cry_smile.png

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/devil_smile.pn
g

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/embaressed_smi
le.gif

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/embarrassed_sm
ile.gif

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/embarrassed_sm
ile.png
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/envelope.gif
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/envelope.png
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/heart.gif
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/heart.png
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/kiss.gif
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/kiss.png
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/lightbulb.gif
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/lightbulb.png
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/omg_smile.gif
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/omg_smile.png

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/regular_smile.
gif

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/regular_smile.
png
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/sad_smile.gif
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/sad_smile.png

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/shades_smile.g
if

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/shades_smile.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.gi
f

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/teeth_smile.pn
g

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.gi
f

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/thumbs_down.pn
g
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.gif
	sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/thumbs_up.png

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.g
if

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/tongue_smile.p
ng

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/tounge_smile.g
if

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/whatchutalking
about_smile.gif

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/whatchutalking
about_smile.png

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/wink_smile.gif

sites/all/modules/ckeditor/ckeditor/plugins/smiley/images/wink_smile.png
	sites/all/modules/ckeditor/ckeditor/samples/assets/inlineall/logo.png
	sites/all/modules/ckeditor/ckeditor/samples/assets/sample.jpg
	sites/all/modules/ckeditor/ckeditor/samples/inlinetextarea.html
	sites/all/modules/ckeditor/ckeditor/skins/moono/editor_ie7.css
	sites/all/modules/ckeditor/ckeditor/skins/moono/editor_iequirks.css
	sites/all/modules/ckeditor/ckeditor/skins/moono/images/arrow.png
	sites/all/modules/ckeditor/ckeditor/skins/moono/images/close.png
	sites/all/modules/ckeditor/ckeditor/skins/moono/images/hidpi/close.png

sites/all/modules/ckeditor/ckeditor/skins/moono/images/hidpi/lock-open.p
ng
	sites/all/modules/ckeditor/ckeditor/skins/moono/images/hidpi/lock.png

sites/all/modules/ckeditor/ckeditor/skins/moono/images/hidpi/refresh.png
	sites/all/modules/ckeditor/ckeditor/skins/moono/images/lock-open.png
	sites/all/modules/ckeditor/ckeditor/skins/moono/images/lock.png
	sites/all/modules/ckeditor/ckeditor/skins/moono/images/refresh.png
	sites/all/modules/libraries/tests/example/example_1.php
	sites/all/modules/libraries/tests/example/example_2.php

sites/all/modules/libraries/tests/modules/libraries_test_module/librarie
s_test_module.inc

sites/all/modules/libraries/tests/themes/libraries_test_theme/libraries_
test_theme.inc