no message
Merge branch 'master' of https://github.com/jlandersen/sw10

Conflicts:
	Code/Animus/application<init>4.lp
	Code/Animus/src/sw10/animus/analysis/Analyzer.java
	Code/Animus/src/sw10/animus/analysis/CostComputerMemory.java
	Code/Animus/src/sw10/animus/build/AnalysisEnvironmentBuilder.java
	Code/Animus/src/sw10/animus/program/Program.java
	Code/Animus/src/sw10/animus/util/Util.java
	Code/Wala Exploration/src/SimpleApplication.java