Fixes findbugs issues for Restaurant side
Merge pull request #350 from glee23/master

Fixes findbugs issues for restaurant side
Merge remote-tracking branch 'upstream/master'