Merge remote-tracking branch 'origin/master' into expression-prefix-regex

Conflicts:
	plugins/c9.ide.language/language_test.js

node_modules/c9/format-user-analytics.js

@@ -0,0 +1,46 @@
+if (define === undefined) {
+    var define = function(fn) {
+        fn(require, exports, module);
+    };
+}
+
+define(function(require, exports, module) {
+    "use strict";
+
+    function formatUser(user) {
+        if (!user) return {}; // empty traits get ignored
+
+         var traits = {
+                uid: user.id || user.uid,
+                username: user.name || user.username,
+                email: user.email,
+                createdAt: user.date_add,
+                active: !!user.active,
+                firstName: getFirstName(user),
+                lastName: getLastName(user),
+                name: user.fullname || user.name,
+                pricingPlan: user.premium ? "Premium" : "Free",
+                region: user.region
+            };
+
+        return traits;
+    }
+
+    function getFirstName(user){
+        if (user.firstname) return user.firstname;
+        
+        if (!user.fullname) return undefined;
+       
+        return user.fullname.split(' ').slice(0, 1).join(' ');
+    }
+
+    function getLastName(user){
+        if (user.lastname) return user.lastname;
+        
+        if (!user.fullname) return undefined;
+       
+        return user.fullname.split(' ').slice(1).join(' ');
+    }
+
+    module.exports = formatUser;
+});

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.893",
+    "version": "3.1.909",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",