Manually merged in the external 4.x fork.

.gitattributes

@@ -1,14 +1,16 @@
-#* crlf=crlf
-#* eol=crlf
-*.jar binary
-*.gif binary
-*.png binary
-*.jpg binary
-*.swf binary
-*.xap binary
-*.zip binary
-*.mov binary
-*.avi binary
-*.flv binary
-*.rm binary
-*.dcr binary
+* eol=lf
+*.jar binary
+*.gif binary
+*.png binary
+*.jpg binary
+*.swf binary
+*.xap binary
+*.zip binary
+*.eot binary
+*.woff binary
+*.ttf binary
+*.mov binary
+*.avi binary
+*.flv binary
+*.rm binary
+*.dcr binary

.gitignore

@@ -1,27 +1,30 @@
-bin
-obj
-tmp
-docs
-.settings
-.idea
-.project
-*.sublime-*
-.externalToolBuilders
-*~
-*.diff
-*.patch
-*.bak
-*.log
-*.swp
-.DS_Store
-.project
-editor_plugin.js
-editor_template.js
-jscripts/tiny_mce/jquery.tinymce.js
-jscripts/tiny_mce/tiny_mce.js
-jscripts/tiny_mce/tiny_mce_jquery.js
-jscripts/tiny_mce/tiny_mce_jquery_src.js
-jscripts/tiny_mce/tiny_mce_prototype.js
-jscripts/tiny_mce/tiny_mce_prototype_src.js
-jscripts/tiny_mce/tiny_mce_src.js
-build-utils
+bin
+obj
+tmp
+docs
+.settings
+.idea
+.project
+*.sublime-*
+.externalToolBuilders
+*~
+*.diff
+*.patch
+*.bak
+*.log
+*.swp
+.DS_Store
+.project
+node_modules
+js/tinymce/tinymce.js
+js/tinymce/tinymce.jquery.js
+js/tinymce/plugins/table/plugin.js
+js/tinymce/plugins/spellchecker/plugin.js
+js/tinymce/plugins/paste/plugin.js
+imagemanager
+filemanager
+mcmanager
+*.min.js
+*.dev.js
+*.min.css
+skin.less

.jshintrc

@@ -0,0 +1,69 @@
+{
+	"predef": {
+		"define": true
+	},
+	"passfail": false,
+	"maxerr": 50,
+	"maxparams": 50,
+	"maxdepth": 8,
+	"maxstatements": 150,
+	"maxlen": 140,
+	//"maxcomplexity": 10,
+	"camelcase":false,
+	"browser": true,
+	"node": false,
+	"rhino": false,
+	"couch": false,
+	"wsh": false,
+	"jquery": false,
+	"prototypejs": false,
+	"mootools": false,
+	"dojo": false,
+	"debug": false,
+	"devel": false,
+	"es5": false,
+	"strict": false,
+	"globalstrict": true,
+	"asi": false,
+	"laxbreak": false,
+	"bitwise": true,
+	"quotmark": false,
+	"boss": false,
+	"curly": true,
+	"eqeqeq": false,
+	"eqnull": false,
+	"evil": true,
+	"expr": false,
+	"forin": false,
+	"immed": true,
+	"latedef": true,
+	"loopfunc": false,
+	"noarg": true,
+	"regexp": false,
+	"regexdash": false,
+	"scripturl": false,
+	"shadow": false,
+	"supernew": false,
+	"undef": true,
+	"unused": true,
+	"validthis": false,
+	"smarttabs": true,
+	"proto": false,
+	"onecase": true,
+	"nonstandard": true,
+	"multistr": false,
+	"laxcomma": false,
+	"lastsemic": false,
+	"iterator": false,
+	"funcscope": false,
+	"esnext": false,
+	"newcap": false,
+	"noempty": true,
+	"nonew": true,
+	"nomen": false,
+	"onevar": false,
+	"plusplus": false,
+	"sub": false,
+	"trailing": true,
+	"white": false
+}