Merge branch 'master' into lustre2excel

Conflicts:
	README.md
	src/jkind/ArgumentParser.java
	src/jkind/Main.java
	src/jkind/Settings.java
	src/jkind/analysis/LinearChecker.java
	src/jkind/analysis/StaticAnalyzer.java
	src/jkind/invariant/Candidate.java
	src/jkind/invariant/CandidateGenerator.java
	src/jkind/invariant/Edge.java
	src/jkind/invariant/Invariant.java
	src/jkind/invariant/Node.java
	src/jkind/processes/BaseProcess.java
	src/jkind/processes/InductiveProcess.java
	src/jkind/processes/InvariantProcess.java
	src/jkind/processes/Process.java
	src/jkind/processes/ReduceProcess.java
	src/jkind/processes/SmoothProcess.java
	src/jkind/sexp/Cons.java
	src/jkind/sexp/Symbol.java
	src/jkind/slicing/CounterexampleSlicer.java
	src/jkind/slicing/LustreSlicer.java
	src/jkind/solvers/BoolValue.java
	src/jkind/solvers/Label.java
	src/jkind/solvers/Model.java
	src/jkind/solvers/SatResult.java
	src/jkind/solvers/Solver.java
	src/jkind/solvers/yices/ResultExtractorListener.java
	src/jkind/solvers/yices/Yices.g4
	src/jkind/solvers/yices/Yices.tokens
	src/jkind/solvers/yices/YicesBaseListener.java
	src/jkind/solvers/yices/YicesLexer.java
	src/jkind/solvers/yices/YicesLexer.tokens
	src/jkind/solvers/yices/YicesListener.java
	src/jkind/solvers/yices/YicesParser.java
	src/jkind/solvers/yices/YicesSolver.java
	src/jkind/translation/Expr2SexpVisitor.java
	src/jkind/translation/Lustre2Sexps.java
	src/jkind/translation/Specification.java
	src/jkind/util/Util.java
	src/jkind/writers/ConsoleWriter.java
	src/jkind/writers/ExcelWriter.java
	src/jkind/writers/Writer.java
	src/jkind/writers/XmlWriter.java