Locales cleanup
WoW v6.0.2 API updates
More WoW v6.0.2 API updates
Updated Ace3 library to r1125 for 6.0.3 Nov 01, 2014
Merge remote-tracking branch 'upstream/master' into N2C1

Conflicts:
	Carbonite.Info/Locales/locales.xml
Merge remote-tracking branch 'upstream/master' into N2C1

Resolve Conflicts:
	Carbonite.Info/Locales/locales.xml
Removed temp file
Updated Ace3 library to r1126 for 6.0.3 Nov 10, 2014
More WoW v6.0.2 API updates:

WatchFrameItemButtonTemplate	>>	QuestObjectiveItemButtonTemplate
WatchFrameItem_UpdateCooldown	>>	QuestObjectiveItem_UpdateCooldown
Merge remote-tracking branch 'upstream/master' into N2C1

Resolved conflicts in:
	Carbonite/NxUI.lua
Merge remote-tracking branch 'upstream/master' into N2C1

Conflicts:
	Carbonite/Locales/locales.xml
White space cleanup
Merge remote-tracking branch 'upstream/master' into N2C1
Merge pull request #31 from nelegalno/N2C1

N2C1