fixed reservations/clients conflicts
Merge branch 'boris'
* did reservations
* merged clients w/ fixed conflicts