conflicts removed
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
onkar's changes and jai's changes
Merge branch 'TestBranch_v1.0' of
http://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Merge branch 'TestBranch_v1.0' of
http://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
removed welcome.jsp
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
final changes
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0