Redirect fix
Merge branch 'develop' of github.com:tshafer/orion into develop

Conflicts:
	app/config/orion.php