Merge catalog\controller\module with opencart 1.5.5.1