Ma*2 + das
Merge branch 'master' of https://github.com/monkeythecoder/nuevo_ctin

Conflicts:
	application/controllers/dashboard.php
	application/controllers/equipo.php
	application/models/equipo_model.php
	application/views/dashboard_view.php