Fix classpath issue
Merge branch 'master' of https://github.com/DavidFlorin/XXX.git

Conflicts:
	.classpath