fix build error
Merge branch 'master' of github.com:GreenTeaScript/GreenTeaScript

Conflicts:
	src/JavaByteCodeGenerator.java