Merge branch 'master' of https://github.com/brentsimmons/NetNewsWire into iPadPopover

# Conflicts:
#	iOS/Settings/AddLocalAccountViewController.swift
#	iOS/Settings/DetailAccountViewController.swift
#	iOS/Settings/Settings.storyboard

iOS/Settings/DetailAccountViewController.swift

@@ -23,7 +23,6 @@ class DetailAccountViewController: UITableViewController {
 		nameTextField.text = account.name
 		nameTextField.delegate = self
 		activeSwitch.isOn = account.isActive
-		
     }
 
 	override func viewWillDisappear(_ animated: Bool) {
@@ -33,11 +32,64 @@ class DetailAccountViewController: UITableViewController {
 	
 }
 
-extension DetailAccountViewController: UITextFieldDelegate {
+extension DetailAccountViewController {
+
+	override func numberOfSections(in tableView: UITableView) -> Int {
+		if account == AccountManager.shared.defaultAccount {
+			return 1
+		} else {
+			return super.numberOfSections(in: tableView)
+		}
+	}
+	
+	override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+		let cell = super.tableView(tableView, cellForRowAt: indexPath)
 		
+		let bgView = UIView()
+		bgView.backgroundColor = AppAssets.selectionBackgroundColor
+		cell.selectedBackgroundView = bgView
+		return cell
+	}
+
+	override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+		if indexPath.section == 1 {
+			deleteAccount()
+		}
+		
+		tableView.selectRow(at: nil, animated: true, scrollPosition: .none)
+	}
+	
+}
+
+private extension DetailAccountViewController {
+	
+	func deleteAccount() {
+		let title = NSLocalizedString("Delete Account", comment: "Delete Account")
+		let message = NSLocalizedString("Are you sure you want to delete this account?  This can not be undone.", comment: "Delete Account")
+		let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
+		
+		let cancelTitle = NSLocalizedString("Cancel", comment: "Cancel")
+		let cancelAction = UIAlertAction(title: cancelTitle, style: .cancel)
+		alertController.addAction(cancelAction)
+		
+		let markTitle = NSLocalizedString("Delete", comment: "Delete")
+		let markAction = UIAlertAction(title: markTitle, style: .default) { [weak self] (action) in
+			guard let account = self?.account else { return }
+			AccountManager.shared.deleteAccount(account)
+			self?.navigationController?.popViewController(animated: true)
+		}
+		alertController.addAction(markAction)
+		
+		present(alertController, animated: true)
+	}
+	
+}
+
+extension DetailAccountViewController: UITextFieldDelegate {
+	
 	func textFieldShouldReturn(_ textField: UITextField) -> Bool {
 		textField.resignFirstResponder()
 		return true
 	}
-	
+
 }