Создан выбор Мастер Игрока
Merge remote-tracking branch 'origin/AlexBranch' into JohnBranch

Conflicts:
	src/nstuff/juggerfall/extension/MainExtension.java