Merge admin\controller\sale with 1.5.5.1