Merge "Fixed C++ deploy in Eclipse"

eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/resources/templates/build.properties

@@ -2,8 +2,9 @@
 username=admin
 password=
 deploy.dir=/home/admin
-deploy.run.command=./runcppprogram
-deploy.debug.command=./debugcppprogram
+deploy.kill.command=/usr/local/frc/bin/frcKillRobot.sh -t -r
+deploy.log.file=/var/local/natinst/log/FRC_UserProgram.log
+command.dir=/home/lvuser/
 
 # Libraries to use
 wpilib=${user.home}/wpilib/cpp/${cpp-version}
@@ -21,8 +22,8 @@ build.dir=build
 out.exe=Debug/${out}
 
 # Simulation
-simulation.world.file=$world
+simulation.world.file=/usr/share/frcsim/worlds/GearsBotDemo.world
 sim.exe=Simulate/${out}
 wpilib.sim=${wpilib}/sim
 sim.tools=${wpilib.sim}/tools
-sim.lib=${wpilib.sim}/lib
+sim.lib=${wpilib.sim}/lib