Fix # deploy1
Merge branch 'master' of https://github.com/rosmi/Sample.git

Conflicts:
	Sample/WebContent/Welcome1.html