Merge pull request #8 from tikkss/shop

Modify models and views
refactoring shop_spec