New wizard structur
Merge branch 'ilshat/master'

Conflicts:
	WpfApplication1/MainWindow.xaml.cs
Merge remote-tracking branch 'upstream/master'
Mapper connectors
BlockControl