Added basic auth
Merge branch 'test' into dev