adapted to new UnitGUID format
replaced WatchFrameItemButtonTemplate
use SecureActionButtonTemplate for WatchList items
copied some functions from Blizzard_QuestObjectiveTracker.lua to prevent taint on original tracker
merged
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
Update Main.lua

add translations
Update FlightMasters.lua

Adding minor translation
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
Update FlightMasters.lua

adding many points of interest/flightpath
Update FlightMasters.lua

Add flights for Timeless isle an Isle of giants...  4 lines 325 > 328

Adding multiple entries

Thanks for merge the files
Merge pull request #11 from Naharis/master

use SecureActionButtonTemplate for WatchList items
Merge pull request #12 from powerstrk/master

Update Options.lua
Merge pull request #16 from powerstrk/patch-3

Update Main.lua
Merge remote-tracking branch 'upstream/master' into N2C1

Resolved conflicts in:
	Carbonite/NxUI.lua