regular changes
Merge branch 'dev' of github.com:edwin-site/edwin-shopping into dev
navigationn changes