Merge remote-tracking branch 'remotes/mangosR2.mangos/master'

Conflicts:
	sql/mangos.sql
	src/game/AchievementMgr.cpp
	src/game/Creature.h
	src/game/SharedDefines.h
	src/game/Totem.cpp
[mt898] SpellHandler fixes
[mt899] Attempt to fix Resurrection window prompt