added menu to select/delete devices
fixed the merge conflict
merge fixes again
these merge conflicts are annoying
Merge branch 'master' of https://github.com/jessupjn/CPRemote

Conflicts:
	Windows_Application/CPRemoteApp/CPRemoteApp/ViewController - Settings/SettingsMenu.xaml.cs