Pruebas
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/app/lib/bootstrap/dist/css/bootstrap.css
	src/main/webapp/old/js/core/application.js