Added java class
Merge remote-tracking branch 'remotes/nebm51/master'

Conflicts:
	pom.xml