- More work
Merge branch 'master' of github.com:soywiz/java-aot

Conflicts:
	src/Main.scala
	src/output/SootUtils.scala
	src/output/cpp/ClassTreeGenerator.scala