problems with compiler.. move back to good known state
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
cobertura back in build