Pulling variables out of JPF
Merge branch 'master' of
https://github.com/tjflexmaster/UAV_ROLE_MODEL.git

Conflicts:
	src/listeners/MetricListener.java
Made the metric Manager a singleton, removed it from the Simulator.