push

push
Commit
Commit
merge
Merge origin/AleM into AleM

Conflicts:
	servicio2/nbproject/build-impl.xml
	servicio2/nbproject/project.properties
	servicio2/src/java/Login.java
Merge origin/AleM into AleM