20140611
add web.xml
deploy ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	eJosiamuWeb/.classpath
	eJosiamuWeb/.settings/org.eclipse.wst.common.component
	eJosiamuWeb/readme.txt