v2
Merge branch 'origin'

Conflicts:
	pictorico/footer.php
	pictorico/header.php
	pictorico/index.php
	pictorico/style.css
	timoveld/functions.php
	timoveld/header.php
	timoveld/style.css
	timoveld/style.scss