Update CHANGELOG.txt
Fixed an issue where strings imported from older version of TellMeWhen (roughly pre-v6.0.0) could have their StackMin/Max and DurationMin/Max settings as strings instead of numbers.
Fixed an issue with the new ImportExport.lua that was preventing standalone icons from being imported
ElvUI's timer texts are once again supported by TellMeWhen.
Moved ElvUI[1]:RegisterCooldown to the correct spot in code to avoid excessive registrations and added a safety check
Merge branch 'master' into guids2

Conflicts:
	CHANGELOG.txt
	TellMeWhen.lua
	TellMeWhen.toc
Fixed \Components\Core\Snippets\config.lua:294: attempt to index field "Settings" (a nil value)
Also removed redundant header when importing a snippet
The border for global groups is now within the bounds of the group instead of being outside it.
Fixed TellMeWhen_Options.lua:3253: Missing settings to import (from ImportExport.lua:383: in function "func")
Added a hack to ElvUI's timer texts to obey the setting in TellMeWhen. Previously, they would be enabled for all icons because of a change made by ElvUI's developers.
Merge branch 'master' into guids2

Conflicts:
	CHANGELOG.txt
	TellMeWhen.lua
	TellMeWhen.toc
 * Spell Cooldown icons that are tracking by spellID instead of by name should once again reflect spell charges properly (this functionality was disrupted by a bug introduced by Blizzard in patch 5.4).
Merge branch 'master' into guids2