add new file into project, and there are two files changed: .mds and .tcScript
edit master_notepad.sj
add new files in different encoding
Merge branch 'topic-notepad'

Conflicts:
	TestComplete9/TestCompleteLearning/NotePad/Script/master_notepad.sj
	TestComplete9/TestCompleteLearning/TestCompleteLearning.tcCfgExtender