bug fix for reservation
bug-fix user access
cleaner if statement
Merge pull request #62 from joh641/bugFixReservation

bug fix for reservation
Merge branch 'master' into cuke/inventory

merge