Merge branch 'mstores' of github.com:claryaldringen/Eshop into mstores

Conflicts:
	app/templates/Frontend/basket.latte
	app/templates/Frontend/registration.latte
	htdocs/css/style.css