Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/view/content/tabla-labores.html
Merge origin/master