Oh, Alex... :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ua/triple/game/Element.java
Oh, Alex... :)
Merge remote-tracking branch 'origin/master'