Merge from origin
Merge branch 'fix_getch_input' of https://github.com/BulSV/Zatochka into fix_getch_input

Conflicts:
	Zatochka.pro
	main.cpp
Merge branch 'develop' of https://github.com/BulSV/Zatochka into develop
Merge branch 'abstractFactory' of https://github.com/BulSV/Zatochka into abstractFactory
Merge branch 'abstractFactory' of https://github.com/BulSV/Zatochka into abstractFactory