changed basic auth to be used if username and password is supplied
Merge branch 'master' of https://github.com/jamieomatthews/AndroidNetworkKit