Merge branch 'master' of github.com:travis-ci/travis-ember

Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css

Gemfile.lock

@@ -35,7 +35,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-api.git
-  revision: e8d2604ec3e466856f64f20c42b03829d7cff996
+  revision: 97e06c556f038b5acfea7771ccb7328fac976629
   specs:
     travis-api (0.0.1)
       backports (~> 2.5)

assets/javascripts/app/auth.coffee

@@ -38,7 +38,6 @@
     sessionStorage?.clear()
     @setUser()
 
-
   setUser: (data) ->
     data = JSON.parse(data) if typeof data == 'string'
     user = @storeUser(data) if data
@@ -46,9 +45,9 @@
     @set('user',  if user then user else undefined)
 
   storeUser: (data) ->
+    data.user.access_token ||= data.token # TODO why's the access_token not set on the user?
     localStorage?.setItem('travis.auto_signin', 'true')
     sessionStorage?.setItem('travis.user', JSON.stringify(data))
-    data.user.access_token = data.token # TODO why's the access_token not set on the user?
     @store.load(Travis.User, data.user)
     @store.loadMany(Travis.Account, data.accounts)
     Travis.User.find(data.user.id)