BS3 Inventario y restos de Datatable
Merge branch 'master' of https://github.com/IESMonterroso/intranet

Conflicts:
	admin/actividades/consulta.php
	admin/actividades/indexextra.php