updated java-opencv-test again
merging my opencv change with ariel's maslabgl addition

Merge branch 'master' of https://github.com/jwbowler/maslab-2014