Bug fix and code clean up
Code clean up
Code clean up
Merge remote-tracking branch 'origin/master' into function

Conflicts:
	jkind-common/src/jkind/lustre/visitors/AstMapVisitor.java
	jkind-common/src/jkind/lustre/visitors/ExprMapVisitor.java
	jkind/src/jkind/translation/InlineConstants.java
	jkind/src/jkind/translation/InlineNodeCalls.java
	jkind/src/jkind/translation/InlineUserTypes.java
	jkind/src/jkind/translation/RemoveCondacts.java
	jkind/src/jkind/translation/compound/FlattenCompoundTypes.java
	jkind/src/jkind/translation/tuples/FlattenTupleAssignments.java
	jkind/src/jkind/translation/tuples/FlattenTuples.java