Merge pull request #22 from Empters/shop_settings

ship it
Add delivery and faq controller and views
Add seed data in development and test