Changed Restaurant to use Gasp API version 2
Merge remote-tracking branch 'origin/master'