Add new route for logging in
Merge remote-tracking branch 'origin/master' into deploy