Merge remote-tracking branch 'joshua/cp_space' into develop-2
remove up,left,right walls of defaultcolission test