Merge remote-tracking branch 'Stan/development' into development

JavaIntegration/src/main/java/org/openzen/zencode/java/JavaNativeModule.java

 import org.openzen.zenscript.javashared.JavaFunctionalInterfaceStorageTag;
 import org.openzen.zenscript.javashared.JavaImplementation;
 import org.openzen.zenscript.javashared.JavaMethod;
+import org.openzen.zenscript.javashared.JavaModifiers;
 import stdlib.Strings;
 
 /**
 				functionalInterfaceMethod.getName(),
 				false,
 				getMethodDescriptor(functionalInterfaceMethod),
-				Modifiers.PUBLIC | Modifiers.ABSTRACT,
+				JavaModifiers.PUBLIC | JavaModifiers.ABSTRACT,
 				header.getReturnType().type.isGeneric());
 		StorageTag tag = new JavaFunctionalInterfaceStorageTag(functionalInterfaceMethod, method);
 		return registry.getFunction(header).stored(tag);