Finished FindTravelController
FindHotelController done.
All DB searches made.
Resolved conflict.
Merge branch 'master' of git@github.com:padsof-uam/padsof.git