Mixed commit, user facebook issues

app/assets/javascripts/supplier/app/controllers/settings_controller.js.coffee

@@ -1,6 +1,6 @@
 App.SettingsController = Ember.ObjectController.extend
   needs: ['application']
-  model: (-> @get('controllers.application.supplier')).property('controllers.application.supplier')
+  # model: (-> @get('controllers.application.supplier')).property('controllers.application.supplier')
   time_zones: (-> window.time_zones ).property()
   countries: (-> window.countries ).property()
   editIensProfile: (-> @get('model.country') is 'Netherlands' ).property('model.country')

app/assets/javascripts/supplier/app/routes/settings_route.js.coffee

@@ -1,7 +1,5 @@
 App.SettingsRoute = Ember.Route.extend
-  model: ->
-    Em.RSVP.hash
-      supplier: @controllerFor('application').get('supplier')
-  setupController: (controller, model)->
-    #controller.set 'model', controller.get('controllers.application.supplier')
-    controller.set 'model', model.supplier
+  model: -> @container.lookup('route:application').supplier
+  # setupController: (controller, model)->
+  #   #controller.set 'model', controller.get('controllers.application.supplier')
+  #   controller.set 'model', model.supplier