Merge branch 'crosbot_gpu_dev' of robolab.cse.unsw.edu.au:/home/data/git/ros/crosbot into crosbot_gpu_dev
