Added Basic Auth functionality
Merge branch 'master' into 2.0