Merge branch 'master' into release

Conflicts:
	Essentials/src/com/earth2me/essentials/Essentials.java
	Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
	Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
	Essentials/src/com/earth2me/essentials/register/payment/Methods.java
	Essentials/src/items.csv
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
	lib/bukkit-0.0.1-SNAPSHOT.jar
	lib/craftbukkit-0.0.1-SNAPSHOT.jar

EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java

@@ -3,6 +3,7 @@ package com.nijikokun.bukkit.Permissions;
 import com.nijiko.Misc;
 import com.nijiko.configuration.DefaultConfiguration;
 import com.nijiko.permissions.PermissionHandler;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.permissions.NijikoPermissionsProxy;
@@ -55,6 +56,10 @@ public class Permissions extends JavaPlugin {
 
     @Override
     public void onEnable() {
+		if (!Thread.currentThread().getStackTrace()[5].getMethodName().equals("loadPlugin")) {
+			Logger.getLogger("Minecraft").log(Level.SEVERE, "Another plugin is trying to enable Permissions manually. Don't do this! It's probably "
+					+ Thread.currentThread().getStackTrace()[5].getClassName());
+		}
         Server = this.getServer();
         PluginDescriptionFile pdfFile = this.getDescription();
 

EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java

@@ -65,6 +65,10 @@ public class GroupManager extends JavaPlugin {
 
     @Override
     public void onEnable() {
+		if (!Thread.currentThread().getStackTrace()[5].getMethodName().equals("loadPlugin")) {
+			logger.log(Level.SEVERE, "Another plugin is trying to enable GroupManager manually. Don't do this! It's probably "
+					+ Thread.currentThread().getStackTrace()[5].getClassName());
+		}
         GroupManager.logger.setUseParentHandlers(false);
         ch = new GMLoggerHandler();
         GroupManager.logger.addHandler(ch);