deleting wygwam theme
Merge branch 'staging'

Conflicts:
	themes/third_party/wygwam/images/tbhelp1.png
	themes/third_party/wygwam/images/tbhelp2.png
	themes/third_party/wygwam/lib/ckeditor/ckeditor.js
	themes/third_party/wygwam/lib/ckeditor/config.js
	themes/third_party/wygwam/lib/ckeditor/contents.css
	themes/third_party/wygwam/lib/ckeditor/lang/_translationstatus.txt
	themes/third_party/wygwam/lib/ckeditor/lang/af.js
	themes/third_party/wygwam/lib/ckeditor/lang/ar.js
	themes/third_party/wygwam/lib/ckeditor/lang/bg.js
	themes/third_party/wygwam/lib/ckeditor/lang/bn.js
	themes/third_party/wygwam/lib/ckeditor/lang/bs.js
	themes/third_party/wygwam/lib/ckeditor/lang/ca.js
	themes/third_party/wygwam/lib/ckeditor/lang/cs.js
	themes/third_party/wygwam/lib/ckeditor/lang/cy.js
	themes/third_party/wygwam/lib/ckeditor/lang/da.js
	themes/third_party/wygwam/lib/ckeditor/lang/de.js
	themes/third_party/wygwam/lib/ckeditor/lang/el.js
	themes/third_party/wygwam/lib/ckeditor/lang/en-au.js
	themes/third_party/wygwam/lib/ckeditor/lang/en-ca.js
	themes/third_party/wygwam/lib/ckeditor/lang/en-gb.js
	themes/third_party/wygwam/lib/ckeditor/lang/en.js
	themes/third_party/wygwam/lib/ckeditor/lang/eo.js
	themes/third_party/wygwam/lib/ckeditor/lang/es.js
	themes/third_party/wygwam/lib/ckeditor/lang/et.js
	themes/third_party/wygwam/lib/ckeditor/lang/eu.js
	themes/third_party/wygwam/lib/ckeditor/lang/fa.js
	themes/third_party/wygwam/lib/ckeditor/lang/fi.js
	themes/third_party/wygwam/lib/ckeditor/lang/fo.js
	themes/third_party/wygwam/lib/ckeditor/lang/fr-ca.js
	themes/third_party/wygwam/lib/ckeditor/lang/fr.js
	themes/third_party/wygwam/lib/ckeditor/lang/gl.js
	themes/third_party/wygwam/lib/ckeditor/lang/gu.js
	themes/third_party/wygwam/lib/ckeditor/lang/he.js
	themes/third_party/wygwam/lib/ckeditor/lang/hi.js
	themes/third_party/wygwam/lib/ckeditor/lang/hr.js
	themes/third_party/wygwam/lib/ckeditor/lang/hu.js
	themes/third_party/wygwam/lib/ckeditor/lang/is.js
	themes/third_party/wygwam/lib/ckeditor/lang/it.js
	themes/third_party/wygwam/lib/ckeditor/lang/ja.js
	themes/third_party/wygwam/lib/ckeditor/lang/ka.js
	themes/third_party/wygwam/lib/ckeditor/lang/km.js
	themes/third_party/wygwam/lib/ckeditor/lang/ko.js
	themes/third_party/wygwam/lib/ckeditor/lang/lt.js
	themes/third_party/wygwam/lib/ckeditor/lang/lv.js
	themes/third_party/wygwam/lib/ckeditor/lang/mk.js
	themes/third_party/wygwam/lib/ckeditor/lang/mn.js
	themes/third_party/wygwam/lib/ckeditor/lang/ms.js
	themes/third_party/wygwam/lib/ckeditor/lang/nb.js
	themes/third_party/wygwam/lib/ckeditor/lang/nl.js
	themes/third_party/wygwam/lib/ckeditor/lang/no.js
	themes/third_party/wygwam/lib/ckeditor/lang/pl.js
	themes/third_party/wygwam/lib/ckeditor/lang/pt-br.js
	themes/third_party/wygwam/lib/ckeditor/lang/pt.js
	themes/third_party/wygwam/lib/ckeditor/lang/ro.js
	themes/third_party/wygwam/lib/ckeditor/lang/ru.js
	themes/third_party/wygwam/lib/ckeditor/lang/sk.js
	themes/third_party/wygwam/lib/ckeditor/lang/sl.js
	themes/third_party/wygwam/lib/ckeditor/lang/sr-latn.js
	themes/third_party/wygwam/lib/ckeditor/lang/sr.js
	themes/third_party/wygwam/lib/ckeditor/lang/sv.js
	themes/third_party/wygwam/lib/ckeditor/lang/th.js
	themes/third_party/wygwam/lib/ckeditor/lang/tr.js
	themes/third_party/wygwam/lib/ckeditor/lang/ug.js
	themes/third_party/wygwam/lib/ckeditor/lang/uk.js
	themes/third_party/wygwam/lib/ckeditor/lang/vi.js
	themes/third_party/wygwam/lib/ckeditor/lang/zh-cn.js
	themes/third_party/wygwam/lib/ckeditor/lang/zh.js
	themes/third_party/wygwam/lib/ckeditor/plugins/clipboard/dialogs/paste.js
	themes/third_party/wygwam/lib/ckeditor/plugins/dialog/dialogDefinition.js
	themes/third_party/wygwam/lib/ckeditor/plugins/div/dialogs/div.js
	themes/third_party/wygwam/lib/ckeditor/plugins/fakeobjects/images/spacer.gif
	themes/third_party/wygwam/lib/ckeditor/plugins/image/dialogs/image.js
	themes/third_party/wygwam/lib/ckeditor/plugins/image/images/noimage.png
	themes/third_party/wygwam/lib/ckeditor/plugins/link/dialogs/anchor.js
	themes/third_party/wygwam/lib/ckeditor/plugins/link/dialogs/link.js
	themes/third_party/wygwam/lib/ckeditor/plugins/pastefromword/filter/default.js
	themes/third_party/wygwam/lib/ckeditor/plugins/scayt/dialogs/options.js
	themes/third_party/wygwam/lib/ckeditor/plugins/scayt/dialogs/toolbar.css
	themes/third_party/wygwam/lib/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
	themes/third_party/wygwam/lib/ckeditor/plugins/specialchar/dialogs/specialchar.js
	themes/third_party/wygwam/lib/ckeditor/plugins/stylesheetparser/plugin.js
	themes/third_party/wygwam/lib/ckeditor/plugins/table/dialogs/table.js
	themes/third_party/wygwam/lib/ckeditor/plugins/tabletools/dialogs/tableCell.js
	themes/third_party/wygwam/lib/ckeditor/plugins/templates/dialogs/templates.js
	themes/third_party/wygwam/lib/ckeditor/plugins/templates/templates/default.js
	themes/third_party/wygwam/lib/ckeditor/plugins/wsc/dialogs/ciframe.html
	themes/third_party/wygwam/lib/ckeditor/plugins/wsc/dialogs/wsc.css
	themes/third_party/wygwam/lib/ckeditor/plugins/wsc/dialogs/wsc.js
	themes/third_party/wygwam/lib/ckfinder/changelog.txt
	themes/third_party/wygwam/lib/ckfinder/ckfinder.js
	themes/third_party/wygwam/lib/ckfinder/ckfinder.php
	themes/third_party/wygwam/lib/ckfinder/ckfinder_v1.js
	themes/third_party/wygwam/lib/ckfinder/config.js
	themes/third_party/wygwam/lib/ckfinder/config.php
	themes/third_party/wygwam/lib/ckfinder/core/ckfinder_php5.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/connector.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/constants.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/bg.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/ca.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/cs.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/cy.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/da.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/de.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/el.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/en.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/eo.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/es-mx.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/es.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/et.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/fa.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/fi.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/fr.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/gu.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/he.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/hi.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/hr.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/hu.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/it.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/ja.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/lt.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/lv.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/nb.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/nl.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/nn.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/no.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/pl.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/pt-br.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/ro.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/ru.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/sk.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/sl.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/sv.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/tr.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/vi.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/zh-cn.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/lang/zh-tw.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/CommandHandlerBase.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/CopyFiles.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/CreateFolder.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/DeleteFiles.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/DeleteFolder.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/DownloadFile.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/FileUpload.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/GetFiles.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/GetFolders.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/Init.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/LoadCookies.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/MoveFiles.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/QuickUpload.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/RenameFile.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/RenameFolder.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/Thumbnail.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/CommandHandler/XmlCommandHandlerBase.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/AccessControlConfig.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/Config.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/Connector.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/Factory.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/FolderHandler.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/Hooks.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/ImagesConfig.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/Registry.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/ResourceTypeConfig.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/ThumbnailsConfig.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Core/Xml.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/ErrorHandler/Base.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/ErrorHandler/FileUpload.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/ErrorHandler/Http.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/ErrorHandler/QuickUpload.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Utils/FileSystem.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Utils/Misc.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Utils/Security.php
	themes/third_party/wygwam/lib/ckfinder/core/connector/php/php5/Utils/XmlNode.php
	themes/third_party/wygwam/lib/ckfinder/help/cs/files/011.html
	themes/third_party/wygwam/lib/ckfinder/help/cs/files/header.html
	themes/third_party/wygwam/lib/ckfinder/help/en/files/011.html
	themes/third_party/wygwam/lib/ckfinder/help/en/files/header.html
	themes/third_party/wygwam/lib/ckfinder/help/es-mx/files/011.html
	themes/third_party/wygwam/lib/ckfinder/help/es-mx/files/header.html
	themes/third_party/wygwam/lib/ckfinder/help/es/files/011.html
	themes/third_party/wygwam/lib/ckfinder/help/es/files/header.html
	themes/third_party/wygwam/lib/ckfinder/help/fi/files/011.html
	themes/third_party/wygwam/lib/ckfinder/help/fi/files/header.html
	themes/third_party/wygwam/lib/ckfinder/help/files/other/help.js
	themes/third_party/wygwam/lib/ckfinder/help/lt/files/011.html
	themes/third_party/wygwam/lib/ckfinder/help/lt/files/header.html
	themes/third_party/wygwam/lib/ckfinder/help/pl/files/011.html
	themes/third_party/wygwam/lib/ckfinder/help/pl/files/header.html
	themes/third_party/wygwam/lib/ckfinder/install.txt
	themes/third_party/wygwam/lib/ckfinder/lang/_translationstatus.txt
	themes/third_party/wygwam/lib/ckfinder/lang/bg.js
	themes/third_party/wygwam/lib/ckfinder/lang/ca.js
	themes/third_party/wygwam/lib/ckfinder/lang/cs.js
	themes/third_party/wygwam/lib/ckfinder/lang/cy.js
	themes/third_party/wygwam/lib/ckfinder/lang/da.js
	themes/third_party/wygwam/lib/ckfinder/lang/de.js
	themes/third_party/wygwam/lib/ckfinder/lang/el.js
	themes/third_party/wygwam/lib/ckfinder/lang/en.js
	themes/third_party/wygwam/lib/ckfinder/lang/eo.js
	themes/third_party/wygwam/lib/ckfinder/lang/es-mx.js
	themes/third_party/wygwam/lib/ckfinder/lang/es.js
	themes/third_party/wygwam/lib/ckfinder/lang/et.js
	themes/third_party/wygwam/lib/ckfinder/lang/fa.js
	themes/third_party/wygwam/lib/ckfinder/lang/fi.js
	themes/third_party/wygwam/lib/ckfinder/lang/fr.js
	themes/third_party/wygwam/lib/ckfinder/lang/gu.js
	themes/third_party/wygwam/lib/ckfinder/lang/he.js
	themes/third_party/wygwam/lib/ckfinder/lang/hi.js
	themes/third_party/wygwam/lib/ckfinder/lang/hr.js
	themes/third_party/wygwam/lib/ckfinder/lang/hu.js
	themes/third_party/wygwam/lib/ckfinder/lang/it.js
	themes/third_party/wygwam/lib/ckfinder/lang/ja.js
	themes/third_party/wygwam/lib/ckfinder/lang/lt.js
	themes/third_party/wygwam/lib/ckfinder/lang/lv.js
	themes/third_party/wygwam/lib/ckfinder/lang/nb.js
	themes/third_party/wygwam/lib/ckfinder/lang/nl.js
	themes/third_party/wygwam/lib/ckfinder/lang/nn.js
	themes/third_party/wygwam/lib/ckfinder/lang/no.js
	themes/third_party/wygwam/lib/ckfinder/lang/pl.js
	themes/third_party/wygwam/lib/ckfinder/lang/pt-br.js
	themes/third_party/wygwam/lib/ckfinder/lang/ro.js
	themes/third_party/wygwam/lib/ckfinder/lang/ru.js
	themes/third_party/wygwam/lib/ckfinder/lang/sk.js
	themes/third_party/wygwam/lib/ckfinder/lang/sl.js
	themes/third_party/wygwam/lib/ckfinder/lang/sv.js
	themes/third_party/wygwam/lib/ckfinder/lang/tr.js
	themes/third_party/wygwam/lib/ckfinder/lang/vi.js
	themes/third_party/wygwam/lib/ckfinder/lang/zh-cn.js
	themes/third_party/wygwam/lib/ckfinder/lang/zh-tw.js
	themes/third_party/wygwam/lib/ckfinder/license.txt
	themes/third_party/wygwam/lib/ckfinder/plugins/dummy/lang/en.js
	themes/third_party/wygwam/lib/ckfinder/plugins/dummy/lang/pl.js
	themes/third_party/wygwam/lib/ckfinder/plugins/dummy/plugin.js
	themes/third_party/wygwam/lib/ckfinder/plugins/fileeditor/plugin.js
	themes/third_party/wygwam/lib/ckfinder/plugins/fileeditor/plugin.php
	themes/third_party/wygwam/lib/ckfinder/plugins/flashupload/Uploader.html
	themes/third_party/wygwam/lib/ckfinder/plugins/imageresize/plugin.js
	themes/third_party/wygwam/lib/ckfinder/plugins/imageresize/plugin.php
	themes/third_party/wygwam/lib/ckfinder/plugins/watermark/plugin.php
	themes/third_party/wygwam/lib/ckfinder/plugins/zip/plugin.php
	themes/third_party/wygwam/lib/ckfinder/skins/kama/app.css
	themes/third_party/wygwam/lib/ckfinder/skins/kama/host.css
	themes/third_party/wygwam/lib/ckfinder/skins/kama/richcombo.css
	themes/third_party/wygwam/lib/ckfinder/skins/kama/skin.js
	themes/third_party/wygwam/lib/ckfinder/skins/kama/uipanel.css
	themes/third_party/wygwam/lib/ckfinder/skins/v1/app.css
	themes/third_party/wygwam/lib/ckfinder/skins/v1/host.css
	themes/third_party/wygwam/lib/ckfinder/skins/v1/richcombo.css
	themes/third_party/wygwam/lib/ckfinder/skins/v1/skin.js
	themes/third_party/wygwam/lib/ckfinder/skins/v1/uipanel.css
	themes/third_party/wygwam/lib/ckfinder/translations.txt
	themes/third_party/wygwam/scripts/config_edit_advanced.js
	themes/third_party/wygwam/scripts/config_edit_toolbar.js
	themes/third_party/wygwam/scripts/matrix2.js
	themes/third_party/wygwam/scripts/wygwam.js
	themes/third_party/wygwam/styles/config_edit.css
	themes/third_party/wygwam/styles/wygwam.css
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'upgrade' into staging

Conflicts:
	upgrade.sh
deleted upgrade files: upgrade.sh and offline.html
Merge branch 'develop' into staging

Conflicts:
	upgrade.sh
removed upgradef iles: upgrade.sh and offline template
Merge branch 'staging'
updated uncompressed library and master.js files. don't need a chinese
js file anymore
added ce cache config to easily turn off caching for dev
updated footers to use uncompressed js file. moved fancybox into library
js file.

using the same master.js on english and chinese