Repair default missing image.
Add WebStoreDetails
Repair header formating - user profile
Add 'about us' in WebStoreDetails
change to last commit
Merge pull request #19 from Empters/login_tests

Added feature tests for login
fix path to tool paperclip
Merge pull request #20 from Empters/login_tests

fix layout
Merge branch 'master' of https://github.com/Empters/HealthPriority into shop_settings

Conflicts:
	app/views/layouts/application.html.erb
Repair admin page category paging
Repair root categories init - lazy loading - application controller
Merge pull request #21 from Empters/shop_settings

Shop settings
Modify search and filter mechanism
Merge branch 'master' of https://github.com/Empters/HealthPriority into shop_settings
Merge branch 'master' into login_tests

Conflicts:
	app/views/layouts/application.html.erb
Repair categories init
Merge pull request #22 from Empters/shop_settings

ship it
Add delivery and faq controller and views
Add seed data in development and test
Merge pull request #23 from Empters/shop_settings

Shop settings