Merge branch 'master' of C:\Users\User\workspace\prescient-service with conflicts.
Guest Stay Details by Guest Id service, API Sandbox added