Merge pull request #11 from najezenejjezek/master

stars everywhere
pridana scena Armory, plus drobne upravy
Merge remote-tracking branch 'upstream/master'

Conflicts:
	www/script/main.js