Merge pull request #9 from cesaenzv/desarrolloCarlos

Poniendo al día las dos branchs
Merge pull request #12 from cesaenzv/desarrolloCarlos

Puesta al día desarrollo y Master
Merge https://github.com/cesaenzv/sistemabusqueda into desarrollo

Conflicts:
	application/routes.php
	application/views/master.blade.php
arreglo de conflicto de merge en ranking repository
Merge branch 'desarrolloCarlos' of https://github.com/cesaenzv/sistemabusqueda into desarrollo

Conflicts:
	application/models/rankingRepository.php
	application/routes.php
	application/views/master.blade.php
semantic search fix
Merge pull request #15 from Dleonheart/desarrollo

Desarrollo