Merge branch 'master' of https://github.com/EQEmu/Server

Conflicts:
	changelog.txt

utils/sql/git/required/2014_10_13_RaidLeadership.sql

@@ -0,0 +1,9 @@
+CREATE TABLE `raid_leaders` (
+	`gid` int(4) unsigned NOT NULL,
+	`rid` int(4) unsigned NOT NULL,
+	`marknpc` varchar(64) NOT NULL,
+	`maintank` varchar(64) NOT NULL,
+	`assist` varchar(64) NOT NULL,
+	`puller` varchar(64) NOT NULL,
+	`leadershipaa` tinyblob NOT NULL
+);