Added functionality for basic authenticate on username.
Merge remote-tracking branch 'origin/develop' into develop