Merge branch 'develop/1.1.1' of https://github.com/timosmit/wolfadmin …

…into develop/1.2.0

# Conflicts:
#	luascripts/admin/admin.lua
#	luascripts/admin/rules.lua
#	luascripts/admin/warns.lua
#	luascripts/commands/admin/dewarn.lua
#	luascripts/commands/admin/listlevels.lua
#	luascripts/commands/admin/lock.lua
#	luascripts/commands/admin/putbots.lua
#	luascripts/commands/admin/readconfig.lua
#	luascripts/commands/admin/setlevel.lua
#	luascripts/commands/admin/showwarns.lua
#	luascripts/commands/admin/sprees.lua
#	luascripts/commands/admin/stats.lua
#	luascripts/commands/admin/unlock.lua
#	luascripts/commands/admin/warn.lua
#	luascripts/commands/client/pm.lua
#	luascripts/commands/client/r.lua
#	luascripts/commands/commands.lua
#	luascripts/commands/server/csay.lua
#	luascripts/db/mysql.lua
#	luascripts/db/sqlite3.lua
#	luascripts/game/sprees.lua
#	luascripts/players/greetings.lua
#	luascripts/players/stats.lua
#	luascripts/util/settings.lua