N2C6

newline at end of file
Updated Carbonite.Quests locales to current
white space cleanup
Should tis be  QuestWatchTip  or  QuestWatch?
Updated to current
Merge remote-tracking branch 'upstream/master' into N2C6
Fix The Maelstrom continent number based on http://www.wowinterface.com/forums/showpost.php?p=302054&postcount=685

Probably based on the info from the function in Carbonite/NxMap.lua at line 8405
Updated Zones.lua
Updated translation files for https://github.com/nelegalno/Carbonite/commit/3d0cbf6064a25c93f5d075a5cce9651abca60324
Merge remote-tracking branch 'upstream/master' into N2C6

Conflicts:
	Carbonite.Quests/Locales/enUS.lua
	Carbonite.Quests/Locales/zhCN.lua
Resolved merge conflicts
missed a translation in Carbonite.Quests/Locales/zhCN.lua
Merge pull request #78 from nelegalno/N2C6

N2C6