Thirs commit from I5A before pulling merged
Merge branch 'master' of https://github.com/yigosan/TestCommit
Merge branch 'master' of https://github.com/yigosan/TestCommit

Conflicts:
	TestCommit/Patch1.aspx