Merge origin/master

Conflicts:
	web/empleado/index.html