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

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