Fix
Merge branch 'master' of github.com:tomrus88/WowAddin

Conflicts:
	WowAddin/ObjectMgr.h