Corecomponents - Added NON-NLS tag to hardcoded strings not needing National Language Support
Resolved merge conflict.
Merge pull request #660 from mrtizmo/corecomponents

Corecomponents - Added NON-NLS comment tags