Fix issue with concurrent modification
Merge branch 'master' of github.com:albinodervall/RTS

Conflicts:
	src/rts/services/DeployerService.java