operator fleshing
Merge branch 'robDev' into workload

Conflicts:
	src/model/actors/Operator.java
	src/model/actors/OperatorGui.java
	src/model/team/Channels.java