blub
Merge branch 'master' of https://github.com/fin-ger/cg-st-adv

Conflicts:
	st-adv-Main/Content/JnRWorld/JnRPlayer.cs