Add basic auth support
fix merge conflict
Merge branch 'jencka-basic-auth'
* Pull req 10