cleaning up
Merge remote-tracking branch 'origin/master'

Conflicts:
	subsolr/pom.xml