Updated robot spawning, no more hard coded robot types
Merge remote-tracking branch 'origin/master'