switched image to  glyphicon image in truck edit page
fixed merge ish
fixed merge conflict