codeigniter 2.x upgrade

please merge.