.....

Signed-off-by: NadezhdaMazina <Mazina-Nadegda@yandex.ru>
Merge branch 'master' of https://github.com/feyverkKillSoft/course

Conflicts:
	build/built-jar.properties
	src/course/MainForm.java
	src/course/MasterForm.form
	src/course/MasterForm.java