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 pull request #1 from Rythal/master

Routine sync with main carbonite
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
Update Options.lua

correcting spelling in French
Update Com.lua

correcting spelling in French
Update Guide.lua

correcting spelling in French
Update Guide.lua

minor correction line 68
More WoW v6.0.2 API updates:

WatchFrameItemButtonTemplate	>>	QuestObjectiveItemButtonTemplate
WatchFrameItem_UpdateCooldown	>>	QuestObjectiveItem_UpdateCooldown
Update Main.lua

add translations
Update FlightMasters.lua

Adding minor translation
Merge pull request #2 from Rythal/master

Routine sync with main carbonite
Some tiny little modification
Update FlightMasters.lua

Adding more translations
Update Options.lua

82"Restore map scale after track"] = "Restaurer l'échelle de la map après pistage"
83"When enabled, restores your previous map scale when tracking is cleared."] = "Quand activé, restaure l'échelle de map précedente quand le pistage est terminé."
WARNING : removed a double command line DATA exist line 78-79 doubled to the line 82-83, I hope it is correct that we can remove identical lines... Rythal... can you merge (s) the files please THX