ij mac fix
java update to work with java 1.6
aryeh segmentation 3d
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Filtering/logFilter.m
	Interface/ImageJ/ijpath.m