ignoring real config file
Merge branch 'auth'
Merge branch 'streaming'