Merge upstream/master to incorporate EQEmu fixes

Resolve CMake style conflict in common/CMakeLists.txt by adopting
the lowercase CMake command style used consistently throughout
the upstream codebase.

common/spdat.h

@@ -15,12 +15,12 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef SPDAT_H
-#define SPDAT_H
 
-#include "classes.h"
-#include "skills.h"
-#include "item_data.h"
+#pragma once
+
+#include "common/classes.h"
+#include "common/item_data.h"
+#include "common/skills.h"
 
 #define SPELL_UNKNOWN 0xFFFF
 #define POISON_PROC 0xFFFE
@@ -1919,5 +1919,3 @@ bool IsDamageShieldOnlySpell(uint16 spell_id);
 bool IsDamageShieldAndResistSpell(uint16 spell_id);
 bool IsHateSpell(uint16 spell_id);
 bool IsDisciplineTome(const EQ::ItemData* item);
-
-#endif