intermediate commit, completely useless
Merge branch 'master' into JTRDev

Conflicts:
	src/model/WiSARModel.java
	src/model/actors/gen/MissionManager.java
	src/model/actors/gen/Operator.java
	src/model/actors/gen/ParentSearch.java
	src/model/scaffold/Interpreter.java
	src/model/scaffold/Operator.txt
	src/model/scaffold/ParentSearch.txt
	src/model/team/NewWiSARTeam.java