Form fix
Form fix2
Merge branch 'master' of github1210:vitaly1210/tdagat

Conflicts:
	.gitignore
	.idea/misc.xml
	.idea/tdagat.iml
	.idea/workspace.xml