add session var to keep track of subdomain
Merge branch 'dev'