Merge remote-tracking branch 'remotes/mangosR2.mangos/master'
Some changes in spells to fit Cataclysm per effect spells. Random compile fixes.