Merge branch 'TestBranch_v1.0' of http://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Changes for myjsp
conflicts removed
Welcome jsp made changes
Welcome jsp made changes
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0

Conflicts:
	Test_WebApp/WebContent/index.jsp
	Test_WebApp/WebContent/welcome.jsp