Buff Icons now appear
Merge remote-tracking branch 'origin/master'

Conflicts:
	MonsterFeelings/MonsterFeelings-csharp.sln
	MonsterFeelings/MonsterFeelings.sln