updated reservation/services stuff
Merge branch 'boris'
* fixed some errors/conflicts with reservations