add ....
add ....
Merge branch 'master' of https://github.com/wulixu/TronCell

Conflicts:
	ChannelChance/Common/Appconfig.cs
	ChannelChance/Controls/StepOneControl.xaml
	ChannelChance/Controls/StepOneControl.xaml.cs
	ChannelChance/Controls/StepThreeControl.xaml
	ChannelChance/Controls/StepThreeControl.xaml.cs
	ChannelChance/Controls/StepTwoControl.xaml
	ChannelChance/Controls/StepTwoControl.xaml.cs
Merge branch 'master' of https://github.com/wulixu/TronCell

Conflicts:
	ChannelChance/ChannelChance.csproj