Add local login to handle our API
Merge remote-tracking branch 'origin/master'