Minor change in Timer.
Clean trailing whitespace.
Merge branch 'master' into subword-parser.

Conflicts:
	src/gluon/AnalysisMain.java
	src/gluon/analysis/programBehavior/ClassBehaviorAnalysis.java
	src/gluon/analysis/programBehavior/WholeProgramBehaviorAnalysis.java
	src/gluon/contract/Contract.java
	src/gluon/parsing/parser/Parser.java
	src/gluon/parsing/parsingTable/ParsingTable.java