fixing gem issue
added views for edit index and show for shops
fixed edit
fixed edit for cafe
changed show and fixed merge conflicts