fixing error text
Merge branch 'issue-02'

Conflicts:
	src/main/webapp/WEB-INF/jsp/welcome.jsp