Fixed compile problems
Updated pom.xml

Signed-off-by: Lennart ten Wolde <0p1q9o2w@hotmail.nl>
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml