Merge origin/master

Conflicts:
	SOLSA/src/java/Aprobador/AltaUsuario.java
	SOLSA/web/WEB-INF/web.xml