asda
Merge branch 'master' of https://github.com/willianETS/dulceregalos.git
registra recordatorios-falta arreglar el event.js
Merge branch 'master' of https://github.com/willianETS/dulceregalos.git

Conflicts:
	src/main/java/com/spring/app/mycontrollers/ServicePublicController.java
	src/main/java/com/spring/app/mycontrollers/UsuarioController.java
	src/main/webapp/WEB-INF/views/usuario/header.jsp
	src/main/webapp/js/usuario/usuario.js
comitted