fixed classpath
added new field
Merge remote-tracking branch 'origin/master' into eclipse

Conflicts:
	.classpath