Merge origin/master into newChange

Conflicts:
	src/operator/BinaryNode.java
	src/operator/UnaryNode.java
Version 0.7