Added {resource.x} text tags
Display icon & overlay with padlock when it is unlocked
Bump version to 1.6.3
Merge remote-tracking branch 'upstream/master'

Conflicts:
	IconText.lua