Fix compile
Merge remote-tracking branch 'origin/master'

Conflicts:
	eclipse-tools/src/main/java/ma/glasnost/orika/impl/generator/EclipseJdtCompiler.java