Rating - Popup
Conflict rmoved
Merge branch 'development'
gemfile updated
Booking page integrated
Changes
Merge branch 'master' into development
added payments page
conflict