Merge admin\controller\setting with 1.5.5.1