progress
Merge branch 'master' of https://github.com/mahmut070/slate_wimbressers

Conflicts:
	dev/php/templates/footer.php
	dev/php/templates/header.php
	dev/php/templates/template-leftsidebar.php
	dev/scss/modules/_header.scss
	dev/scss/modules/_webshop.scss