Merge admin\controller\catalog with 1.5.5.1