Merge remote branch 'upstream/master' into requirejs

Conflicts:
	demo/boot.js
	package.json

package.json

@@ -3,8 +3,9 @@
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
     "version": "0.1.0",
     "homepage" : "http://github.com/ajaxorg/ace",
-    "engines": {"node": ">= 0.1.102"},
+    "engines": {"node": ">= 0.2.0"},
     "author": "Fabian Jakobs <fabian@ajax.org>",
+    "main": "lib/ace",
     "repository" : {
         "type" : "git",
          "url" : "http://github.com/ajaxorg/ace.git"
@@ -23,7 +24,15 @@
         "requirejs": ">=0.22.0"
     },
     "licenses": [{
-        "type": "LGPLv3",
-        "url": "http://www.gnu.org/licenses/lgpl-3.0.txt"}
-    ]
-}
+        "type": "MPL",
+        "url": "http://www.mozilla.org/MPL/"
+    },
+    {
+        "type": "GPL",
+        "url": "http://www.gnu.org/licenses/gpl.html"
+    },
+    {
+        "type": "LGPL",
+        "url": "http://www.gnu.org/licenses/lgpl.html"
+    }]
+}