Merge remote-tracking branch 'xpressengine/master' into Cover-Image-MULTILANG

Conflicts:
	common/js/plugins/jquery.fileupload/js/main.min.js

min 파일은 자동 생성되리라 믿고 포기.

modules/editor/skins/ckeditor/editor.html

@@ -32,9 +32,9 @@
 <script>
 (function($){
 	"use strict";
-
 	// editor
 	$(function(){
+		<!--@if(!FileHandler::exists('common/js/plugins/ckeditor/ckeditor/config.js'))-->CKEDITOR.config.customConfig = '';<!--@endif-->
 		var settings = {
 			ckeconfig: {
 				height: '{$editor_height}',