Merge branch '4.1-dev' of https://github.com/Windower/Lua into Windower-4.1-dev

Conflicts:
	addons/AutoRA/AutoRA.lua
	addons/addons.xml
	addons/aecho/ReadMe.md
	addons/aecho/aecho.lua
	addons/aecho/data/settings.xml
	addons/autoinvite/autoinvite.lua
	addons/azureSets/Readme.md
	addons/azureSets/azuresets.lua
	addons/battlemod/static_vars.lua
	addons/ffocolor/data/settings.xml
	addons/ffocolor/ffocolor.lua
	addons/scoreboard/damagedb.lua
	addons/scoreboard/display.lua
	addons/scoreboard/mergedplayer.lua
	addons/scoreboard/readme.txt
	addons/scoreboard/scoreboard.lua