Simulator and Event updates.
Merge branch 'master' of
https://github.com/tjflexmaster/UAV_ROLE_MODEL.git

Conflicts:
	src/model/actors/MissionManager.java
	src/model/actors/ParentSearch.java
	src/model/team/WiSARTeam.java
	src/simulator/ITransition.java
	src/simulator/Simulator.java