Removed conflict data from actor
small cleanup
Code cleanup from structure mods.
Merged the Simulator
Merge branch 'master' of
https://github.com/tjflexmaster/UAV_ROLE_MODEL.git

Conflicts:
	src/CUAS/Simulator/Simulator.java