fixed reservation fields
Merge branch 'wendy' into devbranch