ajustes 26/06
Revert "ajustes 26/06"

This reverts commit 539cf4073fc7b0b798c0789ca23cac5052d43063.
Revert "Revert "ajustes 26/06""

This reverts commit f880f8121df93f558b9ade127969749584a0633d.
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/admin/tasks/table.php
	public/css/admin/masterpage.css
	public/js/admin/admin.js