Merge origin/master

Conflicts:
	src/main/webapp/jsp/usuario/list.jsp