web.xml added and renamed testpage to index.
Merge remote-tracking branch 'origin/HEAD' into HEAD