Cleaned up Simulator singleton
Merge branch 'workload' of
https://github.com/tjflexmaster/UAV_ROLE_MODEL.git into workload

Conflicts:
	src/simulator/Simulator.java