bug fixes
Merge branch 'master' of https://github.com/SFuhrmann/NNZPOASF2PMMORPGEAHSB

Conflicts:
	Assets/objects/scripts/ToolTipController.cs