Merge remote-tracking branch 'origin/master' into dorka
Merge branch 'dorka' of https://github.com/trombipeti/mordordefense into dorka