Merge origin/master

Conflicts:
	application/controllers/sede.php
	application/views/header.php
	application/views/sede/consultar.php
	public/images/loading.gif
Merge origin/master

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

Conflicts:
	application/controllers/empleado.php