Ultimo arreglos.(FOllowing route)
Merge branch 'guillermo' of github.com:jhhernandez/SI

Conflicts:
	src/model/agents/SearchAgent.cpp
	src/model/agents/WorkingAgent.cpp