Now storing auth token in session.
Merge remote-tracking branch 'origin'