     @IBAction func logoutAction(sender: AnyObject) {
         smappeeController.logOut()
         serviceLocation = nil
+        serviceLocationInfo = nil
         actuator = nil
         updateButtonStates()
     }

    override func viewWillAppear(animated: Bool) {
        super.viewWillAppear(animated)
        updateButtonStates()
    }
    
    func updateButtonStates() {

    
    func loginViewController(loginViewController: LoginViewController, didReturnUsername username: String, password: String) {

        loginCompletion?(smappeeLoginSuccess(username, password))
        loginCompletion = nil

        self.dismissViewControllerAnimated(true, completion: nil)
    }

    // MARK: ViewController life-cycle methods
