Merge origin/multinal1 into multinal1

Conflicts:
	nars_java/nars/inference/Executive.java