..
Merge branch 'master' of https://github.com/LikeHoo/HotWire

Conflicts:
	HotWire/HotWire/MainWindow.xaml
	HotWire/HotWire/MainWindow.xaml.cs