Merge origin/master

Conflicts:
	src/net/apocalypselabs/symat/functions.java.txt

src/net/apocalypselabs/symat/CodeCompleter.java

@@ -109,6 +109,10 @@ public class CodeCompleter {
                     switch (fileid) {
                         case "functions":
                             String[] args = line.split("\\|");
+                            // Prefix symat to Java commands
+                            if (lang.equals("java")) {
+                                args[0] = "symat." + args[0];
+                            }
                             if (args.length == 2) {
                                 provider.addCompletion(new BasicCompletion(provider, args[0], args[1]));
                             } else if (args.length == 3) {

src/net/apocalypselabs/symat/functions.java.txt

@@ -3,4 +3,4 @@ JavaFunctions symat = new JavaFunctions();
 public static final double E = java.lang.Math.E;
 public static final double PI = java.lang.Math.PI;
 public static final double SQRT1_2 = java.lang.Math.sqrt(0.5);
-public static final double SQRT2 = java.lang.Math.sqrt(2);
+public static final double SQRT2 = java.lang.Math.sqrt(2);