added environment variables
Merge branch 'replaced_site_location'