Merge remote-tracking branch 'origin/ioncannon/quest_system' into Jorge/quest_system

# Conflicts:
#	Data/scripts/player.lua  - Resolved.  Using theirs.

Data/scripts/commands/gm/menuman.lua

@@ -0,0 +1,23 @@
+require("global");
+
+properties = {
+    permissions = 0,
+    parameters = "d",
+    description = "Spawns the menuman",
+}
+
+function onTrigger(player, argc)
+
+    local pos = player:GetPos();
+    local x = pos[1];
+    local y = pos[2];
+    local z = pos[3];
+    local rot = pos[4];
+	
+	local actor = player.CurrentArea:SpawnActor(9114437, "menuman", x, y, z, rot, 0, 0);				
+	
+	if (actor == nil) then
+		player:SendMessage(0x20, "", "This actor class id cannot be spawned.");
+	end
+	
+end;