Cleanup Eclipse project files and test-output files
Added dependencies on branch
Merge branch 'master' into clean-branch

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/master'