complete !
Merge origin/master

Conflicts:
	web/WEB-INF/jsp/welcome.jsp
Merge origin/master

Conflicts:
	web/WEB-INF/jsp/welcome.jsp