Changes to launch files for using different machines
Merge branch 'machineFile' into useServices