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

Conflicts:
	.DS_Store
	archive-team.php
	footer.php
	library/css/creandum-custom.css
	library/js/scripts.js
	new-start-page.php
	page-about.php
	page-contact.php
	page-news.php
	single-investment-content.php