more integration changes
more integration
Merge remote branch 'remote/master'

Conflicts:
	.classpath