Siguientes pasos registro
Merge branch 'master' of https://github.com/wupiti/wupiti-site

Conflicts:
	.gitignore
	src/main/webapp/WEB-INF/views/register.jsp