fix
Merge branch 'master' of github.com:theoris/shop
add some fancy and other