add issue-01
Merge branch 'issue-01' of https://github.com/joseAparici/bugfree-nemesis into issue-01
Merge branch 'issue-01' of https://github.com/joseAparici/bugfree-nemesis into issue-01

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