Merge
Merge branch 'master' of https://github.com/schallalah/outandabout_theme_dev
Conflicts:
	404.php
	archive.php
	carousel.php
	home.php
Carousel integriert
Carousel mergCarousel mergee
Merge branch 'master' of https://github.com/schallalah/outandabout_theme_dev

Conflicts:
	carousel.php