fix conflicts
fix LLVMCodeGen
refactor CodeGenTester
Merge branch 'master' of github.com:konoha-project/KonohaCoffee

Conflicts:
	src/org/KonohaScript/CodeGen/LeafJSCodeGen.java
	src/org/KonohaScript/CodeGen/LeafJSCodeGenTest.java
	src/org/KonohaScript/CodeGen/SimpleVMCodeGen.java
	src/org/KonohaScript/CodeGen/SimpleVMCodeGenTest.java
fix error