Fix minor bug in sessions_controller when user was invalid
Merge branch 'bootstrap' into api