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

Conflicts:
	.htaccess