Added accepted feature to bookings and updated forms
Removed pending tests
booking feature spec and app erb
merged conflicts
Merging