Carl
Merge branch 'master' of https://github.com/carlbanan/Creandum-theme

Conflicts:
	page-news.php