local
Merge remote-tracking branch 'origin/master'
local
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/views/public/login.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/spring/app/mycontrollers/ServicePublicController.java
	src/main/webapp/js/public/inicio.js