Merge pull request #2 from ivan-osipov/master

1
[+]GameObject
[+]GameFieldViewer
[Update]GameFieldOptionsFrame
[Update]GameField
[Update]GameFieldBuilder
Merge branch 'master' of https://github.com/Dmitry-Bocharov/ZvenigorodskyTask into Dmitry-Bocharov-master

Conflicts:

	zvenigorodskyTask/src/main/java/technologyOfProgramming/zvenigorodskyTask/entities/GameField.java
Merge pull request #7 from ivan-osipov/Dmitry-Bocharov-master

Dmitry bocharov master