Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/treasury'
мелочи
Merge remote-tracking branch 'origin/treasury'

Conflicts:
	game/pythoncode/data.py
Фикс
Merge remote-tracking branch 'OldHuntsman/master'