authenticating for staging
Merge branch 'development' into staging
fixed misc issues
Merge branch 'development' into staging