Merge origin/master

Conflicts:
	application/controllers/empleado.php
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	application/controllers/empleado.php
Merge origin/master
Merge origin/master

Conflicts:
	application/controllers/empleado.php
Merge origin/master

Conflicts:
	application/controllers/empleado.php
Merge origin/master

Conflicts:
	application/controllers/empleado.php