Merge branch 'haxesyntax'

Conflicts:
	demo/kitchen-sink/demo.js

demo/kitchen-sink/demo.js

@@ -107,6 +107,7 @@ var modes = [
     new Mode("csharp", "C#", require("ace/mode/csharp").Mode, ["cs"]),
     new Mode("css", "CSS", require("ace/mode/css").Mode, ["css"]),
     new Mode("groovy", "Groovy", require("ace/mode/groovy").Mode, ["groovy"]),
+    new Mode("haxe", "haXe", require("ace/mode/haxe").Mode, ["hx"]),
     new Mode("html", "HTML", require("ace/mode/html").Mode, ["html", "htm"]),
     new Mode("java", "Java", require("ace/mode/java").Mode, ["java"]),
     new Mode("javascript", "JavaScript", require("ace/mode/javascript").Mode, ["js"]),
@@ -229,6 +230,10 @@ var docs = [
         "c_cpp", "C/C++",
         require("ace/requirejs/text!./docs/cpp.cpp")
     ),
+    new Doc(
+        "haxe", "haXe",
+        require("ace/requirejs/text!./docs/Haxe.hx")
+    ),
     new WrappedDoc(
         "markdown", "Markdown",
         require("ace/requirejs/text!./docs/markdown.md")

demo/kitchen-sink/docs/Haxe.hx

@@ -0,0 +1,17 @@
+class Haxe 
+{
+    public static function main() 
+    {
+        // Say Hello!
+        var greeting:String = "Hello World";
+        trace(greeting);
+        
+        var targets:Array<String> = ["Flash","Javascript","PHP","Neko","C++","iOS","Android","webOS"];
+        trace("Haxe is a great language that can target:");
+        for (target in targets)
+        {
+            trace (" - " + target);
+        }
+        trace("And many more!");
+    }
+}