Merge remote-tracking branch 'origin/master' into fix/splitview

Conflicts:
	plugins-client/ext.code/code.js
	plugins-client/ext.main/style/skins.xml

Author: mikedeboer

bin/run.js

@@ -0,0 +1 @@
+../node_modules/runjs/runjs

bin/runjs.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+CMD="$0"
+CMD_DIR=`dirname "$CMD"`
+cd "$CMD_DIR/.."
+
+sudo bin/run.js panic
+make update
+
+case `uname -a` in
+Linux*x86_64*)  echo "Linux 64 bit"
+    bin/run.js start -t:c9 server.js "$@" -a x-www-browser
+    ;;
+
+Linux*i686*)  echo "Linux 32 bit"
+    bin/run.js start -t:c9 server.js "$@" -a x-www-browser
+    ;;
+
+Linux*arm*)  echo "Linux ARM"
+    bin/run.js start -t:c9 server.js "$@" -a x-www-browser
+    ;;
+
+Darwin*)  echo  "OSX"
+    bin/run.js start -t:c9 server.js "$@" -a open
+    ;;
+
+FreeBSD*64*) echo "FreeBSD 64 bit"
+    bin/run.js start -t:c9 server.js "$@" -a open
+    ;;
+
+CYGWIN*)  echo  "Cygwin"
+    bin/run.js start -t:c9 server.js "$@" -a "cmd /c start"
+    ;;
+
+MING*)  echo  "MingW"
+    bin/run.js start -t:c9 server.js "$@" -a "cmd /c start"
+    ;;
+
+SunOS*)  echo  "Solaris"
+    bin/run.js start -t:c9 server.js "$@"
+    ;;
+
+
+*) echo "Unknown OS"
+   ;;
+esac

build/core.build.js

@@ -74,6 +74,9 @@
         "v8debug/util",
         "v8debug/V8Debugger"
     ],
+    exclude: [
+        "text"
+    ],
     out: "./src/core.packed.js",
     inlineText: true,
     findNestedDependencies: true,

build/json_minifier.js

@@ -0,0 +1,13 @@
+var args = process.argv.slice(2),
+    fileIn = args[0],
+    fileOut = args[1],
+    fs = require("fs");
+
+    fs.readFile(fileIn, "utf8", function(err, json) {
+        if (err) {
+            console.error(err);
+            process.exit(1);
+        }
+        
+        fs.writeFileSync(fileOut, JSON.stringify(JSON.parse(json), null));
+    });