WIP

Signed-off-by: Joe Kulig <joseph.kulig@gmail.com>
Merge branch 'cedffca'

Conflicts:
	vmkit/Makefile.llvm.config
	vmkit/lib/J3/ClassLib/Classpath.h
	vmkit/lib/J3/Compiler/JavaAOTCompiler.cpp
	vmkit/lib/J3/Compiler/Makefile
	vmkit/lib/J3/VMCore/JnjvmClassLoader.cpp

Signed-off-by: Joe Kulig <joseph.kulig@gmail.com>
Add includes
Merge branch 'master' of https://github.com/joekoolade/JEI

Conflicts:
	vmkit/Makefile.llvm.config
	vmkit/Makefile.llvm.config.orig

Signed-off-by: Joe Kulig <joseph.kulig@gmail.com>