modifique Compiler.Java
Merge branch 'master' into Compiler

Conflicts:
	Compiler.java
	lib/ErrorHandler.java