support for java 6
changed artifact name for this branch
added java version property
Merge branch '6.1.1-java6'

Conflicts:
	pom.xml