Add LoginVC to login flow. - sometimes it can become "stuck" as the next flight never seems to come back.
Merge remote-tracking branch 'origin/master'
Fix merge conflicts.