local
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/spring/app/mycontrollers/UsuarioController.java
	src/main/webapp/WEB-INF/views/usuario/micuenta.jsp
local
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/spring/app/mycontrollers/UsuarioController.java
	src/main/webapp/js/usuario/usuario.js