various
Merge branch 'wpf' of https://github.com/WindyCityRockr/WinDroid_Universal_HTC_Toolkit into wpf

Conflicts:
	WinDroid/MainWindow.xaml