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