Something.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/dandielo/api/traders/TraderAPI.java
	src/main/java/net/dandielo/api/traders/tNpcAPI.java
	src/main/java/net/dandielo/citizens/traders_v3/bankers/Banker.java
	src/main/java/net/dandielo/citizens/traders_v3/bankers/account/Account.java
	src/main/java/net/dandielo/citizens/traders_v3/bankers/backend/AccountLoader.java
	src/main/java/net/dandielo/citizens/traders_v3/bankers/setting/BGlobalSettings.java
	src/main/java/net/dandielo/citizens/traders_v3/bankers/setting/Settings.java
	src/main/java/net/dandielo/citizens/traders_v3/bankers/tabs/Tab.java
	src/main/java/net/dandielo/citizens/traders_v3/bukkit/CraftBukkitInterface.java
	src/main/java/net/dandielo/citizens/traders_v3/bukkit/DtlTraders.java
	src/main/java/net/dandielo/citizens/traders_v3/bukkit/commands/GeneralCommands.java
	src/main/java/net/dandielo/citizens/traders_v3/core/commands/DtlCommandExecutor.java
	src/main/java/net/dandielo/citizens/traders_v3/core/dB.java
	src/main/java/net/dandielo/citizens/traders_v3/core/events/TraderEvent.java
	src/main/java/net/dandielo/citizens/traders_v3/core/events/tEvent.java
	src/main/java/net/dandielo/citizens/traders_v3/core/events/trader/TraderClickEvent.java
	src/main/java/net/dandielo/citizens/traders_v3/core/events/trader/TraderPrepareEvent.java
	src/main/java/net/dandielo/citizens/traders_v3/core/events/trader/TraderTransactionEvent.java
	src/main/java/net/dandielo/citizens/traders_v3/core/exceptions/attributes/AttributeInvalidValueException.java
	src/main/java/net/dandielo/citizens/traders_v3/core/locale/LocaleEntry.java
	src/main/java/net/dandielo/citizens/traders_v3/core/locale/LocaleManager.java
	src/main/java/net/dandielo/citizens/traders_v3/core/locale/LocaleUpdater.java
	src/main/java/net/dandielo/citizens/traders_v3/tNpcListener.java
	src/main/java/net/dandielo/citizens/traders_v3/tNpcManager.java
	src/main/java/net/dandielo/citizens/traders_v3/tNpcStatus.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/Trader.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/limits/LimitEntry.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/limits/LimitManager.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/patterns/Pattern.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/patterns/PatternManager.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/patterns/types/Item.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/patterns/types/Price.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/setting/GlobalSettings.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/setting/Settings.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/stock/Stock.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/stock/StockItem.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/stock/StockPlayer.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/stock/StockTrader.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/types/Server.java
	src/main/java/net/dandielo/citizens/traders_v3/traders/wallet/Wallet.java
	src/main/java/net/dandielo/citizens/traders_v3/traits/WalletTrait.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/NBTUtils.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/RegexMatcher.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/ItemAttr.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/ItemFlag.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/Modifier.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/Amount.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/Book.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/Enchant.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/Firework.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/GenericDamage.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/GenericHealth.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/GenericKnockback.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/GenericSpeed.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/Name.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/attributes/StoredEnchant.java
	src/main/java/net/dandielo/citizens/traders_v3/utils/items/flags/Lore.java