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

Conflicts:
	ChannelChance/Controls/StepFourControl.xaml.cs