rollback
Merge branch 'master' of https://github.com/dbarrow/ci-regen

Conflicts:
	application/core_modules/install/views/install.php