Combat/Char still a work in progress.
(so far.. its working.. but! had to be rewritten)
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/carbon_cmd.lua
	plugins/carbon_guild.lua
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/carbon_cmd.lua
	plugins/carbon_guild.lua