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

Conflicts:
	src/main/webapp/js/public/inicio.js
Merge remote-tracking branch 'origin/master'
commit local