upated gitignore
Merge branch 'develop' into staging
Merge branch 'staging'
controlling session type via config file