changes for Java8
changes for Java8
Merge branch 'Java8'

Conflicts:
	pom.xml