Fix incorrectly merged Java - Makefile
Fixed cross platform build after introducing Java-7 dependencies
Merge pull request #357 from fyrz/JavaTest-Fix

Fix issues introduced by latest Java additions