jpf error corrections
Merge branch 'robDev' into workload

Conflicts:
	src/model/team/WiSARTeam.java