fixed automatically determine and set the PYRO_ENV variable
fixed automatically determine and set the PYRO_ENV variable

	modified:   .htaccess
Merge branch '2.2/develop' of github.com:kdeng/pyrocms into 2.2/develop

Conflicts:
	.htaccess
Merge pull request #2966 from kdeng/2.2/develop

fixed automatically determine and set the PYRO_ENV variable