default page configured in web.xml

Signed-off-by: whitman.yang <whitman.yang@gmail.com>
Merge branch 'master' of github.com:helloyzy/webprototype

Conflicts:
	src/main/webapp/WEB-INF/web.xml