Dialog
Merge branch 'master' of https://github.com/AlGrigorev/First

Conflicts:
	Dialog/Dialog/Dialog.cpp
	Dialog/Dialog/Dialog_main.cpp
	Dialog/Dialog/cdialog.h