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