merge conflicts

config.js

@@ -1,24 +1,51 @@
 var config = {
-	vr_pong : {
-        url: "http://pong.gamewheel.local",
+    vr_pong: {
+        url: "http://pong",
         port: 3101,
         debugPort: 3201
     },
-    vr_racer : {
-        url: "http://racer.gamewheel.local",
+    vr_racer: {
+        url: "http://racer",
         port: 3102,
         debugPort: 3202
     },
-    editor : {
-        url: "http://3d-editor.gamewheel.local",
+    editor: {
+        url: "http://3d-editor.gamewheel.com",
         port: 3103,
         debugPort: 3203,
         cluster: false
     },
-    api16 : {
-        url: "http://api.gamewheel.local",
+    api16: {
+        url: "http://api16.gamewheel.com",
         port: 3104,
-        debugPort: 3204
+        debugPort: 3204,
+        mailer: {
+            host: 'localhost',
+            port: 9025,
+            secure: false,
+            debug: true,
+            ignoreTLS: true
+        },
+        mongodb: {
+            host: 'mongodb://127.0.0.1',
+            db: 'gamewheel',
+            options: {
+                db: {
+                    native_parser: true
+                },
+                server: {
+                    poolSize: 5,
+                    keepAlive: 120
+                },
+                user: '',
+                pass: '',
+                autoIndex: false
+            }
+        },
+        server: {
+            cluster: false
+        },
+        sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23'
     }
 };