Merge commit '30e72b37034840db18a8d8fa2efefcbde20df2eb'

Conflicts:
	Interface/AddOns/JSHB/libs/AceAddon-3.0/AceAddon-3.0.xml
	Interface/AddOns/JSHB/libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
	Interface/AddOns/JSHB/libs/AceDB-3.0/AceDB-3.0.xml
	Interface/AddOns/JSHB/libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
	Interface/AddOns/JSHB/libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
	Interface/AddOns/JSHB/libs/LibStub/LibStub.lua
	Interface/AddOns/JSHB/libs/LibStub/LibStub.toc
	Interface/AddOns/JSHB/libs/LibStub/tests/test.lua
	Interface/AddOns/JSHB/libs/LibStub/tests/test2.lua
	Interface/AddOns/JSHB/libs/LibStub/tests/test3.lua
	Interface/AddOns/JSHB/libs/LibStub/tests/test4.lua
	Interface/AddOns/Masque/Libs/AceAddon-3.0/AceAddon-3.0.lua
	Interface/AddOns/Masque/Libs/AceAddon-3.0/AceAddon-3.0.xml
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfig-3.0.lua
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfig-3.0.xml
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.xml
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.xml
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua
	Interface/AddOns/Masque/Libs/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.xml
	Interface/AddOns/Masque/Libs/AceDB-3.0/AceDB-3.0.lua
	Interface/AddOns/Masque/Libs/AceDB-3.0/AceDB-3.0.xml
	Interface/AddOns/Masque/Libs/AceDBOptions-3.0/AceDBOptions-3.0.lua
	Interface/AddOns/Masque/Libs/AceDBOptions-3.0/AceDBOptions-3.0.xml
	Interface/AddOns/Masque/Libs/AceGUI-3.0/AceGUI-3.0.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/AceGUI-3.0.xml
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-SimpleGroup.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIContainer-Window.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-Button.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-Heading.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-InteractiveLabel.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
	Interface/AddOns/Masque/Libs/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
	Interface/AddOns/Masque/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
	Interface/AddOns/Masque/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
	Interface/AddOns/Masque/Libs/LibDualSpec-1.0/LibStub.lua
	Interface/AddOns/Masque/Libs/LibStub/LibStub.lua
	Interface/AddOns/Masque/Libs/LibStub/LibStub.toc
	Interface/AddOns/Masque/Libs/LibStub/tests/test.lua
	Interface/AddOns/Masque/Libs/LibStub/tests/test2.lua
	Interface/AddOns/Masque/Libs/LibStub/tests/test3.lua
	Interface/AddOns/Masque/Libs/LibStub/tests/test4.lua
	Interface/AddOns/Quartz/libs/LibStub/LibStub.lua
	Interface/AddOns/TidyPlates/TidyPlates.toc
	Interface/AddOns/TidyPlates/TidyPlatesChanges.log
	Interface/AddOns/TidyPlates/TidyPlatesCore.lua
	Interface/AddOns/TidyPlatesHub/Functions.lua
	Interface/AddOns/TidyPlatesHub/TidyPlatesHub.toc
	Interface/AddOns/TidyPlatesWidgets/TidyPlatesWidgets.toc
	Interface/AddOns/TidyPlates_Graphite/TidyPlates_Graphite.toc
	Interface/AddOns/TidyPlates_Grey/TidyPlates_Grey.toc
	Interface/AddOns/TidyPlates_Neon/TidyPlates_Neon.toc
	Interface/AddOns/TidyPlates_Quatre/TidyPlates_Quatre.toc
	Interface/AddOns/_NPCScan.Overlay/Libs/AceEvent-3.0/AceEvent-3.0.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/AceEvent-3.0/AceEvent-3.0.xml
	Interface/AddOns/_NPCScan.Overlay/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibQTip-1.0/LibStub/LibStub.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibQTip-1.0/LibStub/LibStub.toc
	Interface/AddOns/_NPCScan.Overlay/Libs/LibQTip-1.0/LibStub/tests/test.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibQTip-1.0/LibStub/tests/test2.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibQTip-1.0/LibStub/tests/test3.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibQTip-1.0/LibStub/tests/test4.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibQTip-1.0/lib.xml
	Interface/AddOns/_NPCScan.Overlay/Libs/LibStub/LibStub.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibStub/LibStub.toc
	Interface/AddOns/_NPCScan.Overlay/Libs/LibStub/tests/test.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibStub/tests/test2.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibStub/tests/test3.lua
	Interface/AddOns/_NPCScan.Overlay/Libs/LibStub/tests/test4.lua
	Interface/AddOns/_NPCScan/Libs/AceEvent-3.0/AceEvent-3.0.lua
	Interface/AddOns/_NPCScan/Libs/AceEvent-3.0/AceEvent-3.0.xml
	Interface/AddOns/_NPCScan/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
	Interface/AddOns/_NPCScan/Libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
	Interface/AddOns/_NPCScan/Libs/LibDialog-1.0/lib.xml
	Interface/AddOns/_NPCScan/Libs/LibTextDump-1.0/lib.xml
	Interface/AddOns/_NPCScan/Libs/LibTextTable-1.1/Lib.xml
	Interface/AddOns/_NPCScan/Libs/LibTextTable-1.1/LibTextTable-1.1/Lib.xml
	dev/addons-index.json
no message
Merge branch 'beta'

Conflicts:
	Interface/AddOns/TidyPlates/TidyPlates.toc
	Interface/AddOns/TidyPlatesHub/TidyPlatesHub.toc
	Interface/AddOns/TidyPlatesWidgets/TidyPlatesWidgets.toc
	Interface/AddOns/TidyPlates_Graphite/TidyPlates_Graphite.toc
	Interface/AddOns/TidyPlates_Grey/TidyPlates_Grey.toc
	Interface/AddOns/TidyPlates_Neon/TidyPlates_Neon.toc
	Interface/AddOns/TidyPlates_Quatre/TidyPlates_Quatre.toc
	dev/addons-index.json
Merge branch 'beta'
合并beta到master.
Merge branch 'beta'
jshb不知道为啥消失了.重新上传下.