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