Fix bug in invariant generation
Merge branch 'master' into function
Code clean up
Merge branch 'master' into function

Conflicts:
	jkind/src/jkind/processes/Director.java