Merge - Bug fixes and CodeIgniter 3.0 migration