There we go...
Merge branch 'master' of https://luacs1998@github.com/ForgeEssentials/ForgeEssentialsMain.git into 15

Conflicts:
	src/FE_SRC_CLIENT/com/ForgeEssentials/client/ForgeEssentialsClient.java
	src/FE_SRC_COMMON/com/ForgeEssentials/afterlife/FEskullTe.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/data/DataStorageManager.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/data/ITypeInfo.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/data/TypeData.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/data/TypeEntryInfo.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/data/TypeMultiValInfo.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/json/JSONArray.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/json/JSONObject.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/permissions/Group.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/permissions/IPermissionsHelper.java
	src/FE_SRC_COMMON/com/ForgeEssentials/api/permissions/PermissionsAPI.java
	src/FE_SRC_COMMON/com/ForgeEssentials/commands/CommandButcher.java
	src/FE_SRC_COMMON/com/ForgeEssentials/commands/CommandEnchant.java
	src/FE_SRC_COMMON/com/ForgeEssentials/commands/CommandGive.java
	src/FE_SRC_COMMON/com/ForgeEssentials/commands/CommandKit.java
	src/FE_SRC_COMMON/com/ForgeEssentials/commands/util/CommandButcherTickTask.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/ForgeEssentials.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/commands/ForgeEssentialsCommandBase.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/misc/LoginMessage.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/moduleLauncher/ModuleContainer.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/preloader/Data.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/preloader/asm/FEAccessTransformer.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/preloader/asm/FEPermissionsTransformer.java
	src/FE_SRC_COMMON/com/ForgeEssentials/core/preloader/asm/FEeventAdder.java
	src/FE_SRC_COMMON/com/ForgeEssentials/data/AbstractDataDriver.java
	src/FE_SRC_COMMON/com/ForgeEssentials/data/NBTDataDriver.java
	src/FE_SRC_COMMON/com/ForgeEssentials/data/SQLDataDriver.java
	src/FE_SRC_COMMON/com/ForgeEssentials/data/SavedField.java
	src/FE_SRC_COMMON/com/ForgeEssentials/data/StorageManager.java
	src/FE_SRC_COMMON/com/ForgeEssentials/data/typeInfo/TypeInfoSet.java
	src/FE_SRC_COMMON/com/ForgeEssentials/data/typeInfo/TypeInfoStandard.java
	src/FE_SRC_COMMON/com/ForgeEssentials/permission/AutoPromote.java
	src/FE_SRC_COMMON/com/ForgeEssentials/permission/CommandFEPermGroup.java
	src/FE_SRC_COMMON/com/ForgeEssentials/permission/FlatFileGroups.java
	src/FE_SRC_COMMON/com/ForgeEssentials/permission/ModulePermissions.java
	src/FE_SRC_COMMON/com/ForgeEssentials/permission/PermissionsBlanketHandler.java
	src/FE_SRC_COMMON/com/ForgeEssentials/permission/PermissionsHelper.java
	src/FE_SRC_COMMON/com/ForgeEssentials/permission/SqlHelper.java
	src/FE_SRC_COMMON/com/ForgeEssentials/playerLogger/TickTaskRollback.java
	src/FE_SRC_COMMON/com/ForgeEssentials/protection/ModuleProtection.java
	src/FE_SRC_COMMON/com/ForgeEssentials/snooper/ConfigSnooper.java
	src/FE_SRC_COMMON/com/ForgeEssentials/snooper/response/PlayerInfoResonce.java
	src/FE_SRC_COMMON/com/ForgeEssentials/util/DBConnector.java
	src/FE_SRC_COMMON/com/ForgeEssentials/util/FunctionHelper.java