bb
Merge branch 'topic-notepad'

Conflicts:
	TestComplete9/TestCompleteLearning/NotePad/Script/bb.sj
Merge branch 'topic-notepad'
change xml content
Merge branch 'master' into topic-notepad

Conflicts:
	TestComplete9/TestCompleteLearning/NotePad/Stores/Files/AddTeamServer.xml
	TestComplete9/TestCompleteLearning/NotePad/Stores/Files/User.xml
	TestComplete9/TestCompleteLearning/TestCompleteLearning.tcCfgExtender