test
Merge branch 'master' of https://github.com/Rythal/Carbonite

Conflicts:
	Carbonite.Quests/NxQuest.lua
Merge branch 'master' of https://github.com/IrcDirk/Carbonite

Conflicts:
	Carbonite.Quests/NxQuest.lua