refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/web_shop/details.html