modify model Shop and Category
Merge branch 'master' of https://github.com/tikkss/tsuwari into shop
modify views shops
Merge pull request #8 from tikkss/shop

Modify models and views