dokoncena Armory scena, opraven bug pri zobrazovani textu, nastaveny vychozi staty hrace
Merge remote-tracking branch 'upstream/master'

Conflicts:
	www/script/scene.js